Commit 6519a059 authored by webchick's avatar webchick

Issue #2315015 by alexpott, gauravkhambhala, longwave: Remove...

Issue #2315015 by alexpott, gauravkhambhala, longwave: Remove progress-disabled class and associated CSS
parent 497d3331
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
// interaction while the Ajax request is in progress. ajax.ajaxing prevents // interaction while the Ajax request is in progress. ajax.ajaxing prevents
// the element from triggering a new request, but does not prevent the user // the element from triggering a new request, but does not prevent the user
// from changing its value. // from changing its value.
$(this.element).addClass('progress-disabled').prop('disabled', true); $(this.element).prop('disabled', true);
// Insert progressbar or throbber. // Insert progressbar or throbber.
if (this.progress.type === 'bar') { if (this.progress.type === 'bar') {
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
if (this.progress.object) { if (this.progress.object) {
this.progress.object.stopMonitoring(); this.progress.object.stopMonitoring();
} }
$(this.element).removeClass('progress-disabled').prop('disabled', false); $(this.element).prop('disabled', false);
for (var i in response) { for (var i in response) {
if (response.hasOwnProperty(i) && response[i].command && this.commands[response[i].command]) { if (response.hasOwnProperty(i) && response[i].command && this.commands[response[i].command]) {
...@@ -538,7 +538,7 @@ ...@@ -538,7 +538,7 @@
// Undo hide. // Undo hide.
$(this.wrapper).show(); $(this.wrapper).show();
// Re-enable the element. // Re-enable the element.
$(this.element).removeClass('progress-disabled').prop('disabled', false); $(this.element).prop('disabled', false);
// Reattach behaviors, if they were detached in beforeSerialize(). // Reattach behaviors, if they were detached in beforeSerialize().
if (this.$form) { if (this.$form) {
var settings = response.settings || this.settings || drupalSettings; var settings = response.settings || this.settings || drupalSettings;
......
...@@ -195,10 +195,7 @@ ...@@ -195,10 +195,7 @@
if (rowNames.length) { if (rowNames.length) {
// Add a throbber next each of the ajaxElements. // Add a throbber next each of the ajaxElements.
var $throbber = $('<div class="ajax-progress ajax-progress-throbber"><div class="throbber">&nbsp;</div></div>'); $(ajaxElements).after('<div class="ajax-progress ajax-progress-throbber"><div class="throbber">&nbsp;</div></div>');
$(ajaxElements)
.addClass('progress-disabled')
.after($throbber);
// Fire the Ajax update. // Fire the Ajax update.
$('input[name=refresh_rows]').val(rowNames.join(' ')); $('input[name=refresh_rows]').val(rowNames.join(' '));
......
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
.form-managed-file .form-submit { .form-managed-file .form-submit {
margin: 0 0.5em; margin: 0 0.5em;
} }
.form-managed-file .progress-disabled {
display: inline;
float: none;
}
.form-managed-file div.ajax-progress-bar { .form-managed-file div.ajax-progress-bar {
display: none; display: none;
margin-top: 4px; margin-top: 4px;
......
...@@ -8,11 +8,6 @@ ...@@ -8,11 +8,6 @@
.views-align-center { .views-align-center {
text-align: center; text-align: center;
} }
.view .progress-disabled {
float: none;
}
/* Grid style column align. */ /* Grid style column align. */
.views-view-grid .views-col { .views-view-grid .views-col {
float: left; float: left;
......
...@@ -286,18 +286,6 @@ div.form-item-options-value-all { ...@@ -286,18 +286,6 @@ div.form-item-options-value-all {
} }
/* @end */ /* @end */
/* @group Drupal overrides */
/* The .progress-disabled class added to the form on submit floats the element
* left and causes the form width to shrink-wrap to the content. Setting the
* width to 100% prevents this.
*/
#views-ajax-body form {
width: 100%;
}
/* @end */
/* @group Javascript dependent styling */ /* @group Javascript dependent styling */
.js-only { .js-only {
......
...@@ -306,19 +306,6 @@ th.views-ui-operations { ...@@ -306,19 +306,6 @@ th.views-ui-operations {
/* @group Add view */ /* @group Add view */
/**
* Drupal core forces AJAX triggering elements to float left when they are
* disabled due to AJAX processing. On the add view page, we have inline
* containers where we don't want that behavior; it causes the select dropdown
* which is triggered to jump to the left while the AJAX throbber is active.
*
* See also http://drupal.org/node/769936 (Drupal core issue); when that is
* fixed it may no longer be necessary to do this.
*/
.views-admin .container-inline .progress-disabled {
float: none;
}
/** /**
* I wish this didn't have to be so specific * I wish this didn't have to be so specific
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment