diff --git a/core/misc/ajax.js b/core/misc/ajax.js index af8a29cc0c6a..8fe1dcf7ab6c 100644 --- a/core/misc/ajax.js +++ b/core/misc/ajax.js @@ -436,7 +436,7 @@ // interaction while the Ajax request is in progress. ajax.ajaxing prevents // the element from triggering a new request, but does not prevent the user // from changing its value. - $(this.element).addClass('progress-disabled').prop('disabled', true); + $(this.element).prop('disabled', true); // Insert progressbar or throbber. if (this.progress.type === 'bar') { @@ -475,7 +475,7 @@ if (this.progress.object) { this.progress.object.stopMonitoring(); } - $(this.element).removeClass('progress-disabled').prop('disabled', false); + $(this.element).prop('disabled', false); for (var i in response) { if (response.hasOwnProperty(i) && response[i].command && this.commands[response[i].command]) { @@ -538,7 +538,7 @@ // Undo hide. $(this.wrapper).show(); // 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(). if (this.$form) { var settings = response.settings || this.settings || drupalSettings; diff --git a/core/modules/field_ui/field_ui.js b/core/modules/field_ui/field_ui.js index 6394c3e8d4bd..1167fcc1be1e 100644 --- a/core/modules/field_ui/field_ui.js +++ b/core/modules/field_ui/field_ui.js @@ -195,10 +195,7 @@ if (rowNames.length) { // Add a throbber next each of the ajaxElements. - var $throbber = $('
 
'); - $(ajaxElements) - .addClass('progress-disabled') - .after($throbber); + $(ajaxElements).after('
 
'); // Fire the Ajax update. $('input[name=refresh_rows]').val(rowNames.join(' ')); diff --git a/core/modules/file/css/file.admin.css b/core/modules/file/css/file.admin.css index ff87783aec69..ef7f04d518c3 100644 --- a/core/modules/file/css/file.admin.css +++ b/core/modules/file/css/file.admin.css @@ -10,10 +10,6 @@ .form-managed-file .form-submit { margin: 0 0.5em; } -.form-managed-file .progress-disabled { - display: inline; - float: none; -} .form-managed-file div.ajax-progress-bar { display: none; margin-top: 4px; diff --git a/core/modules/views/css/views.module.css b/core/modules/views/css/views.module.css index 707b71262514..da7a3425a442 100644 --- a/core/modules/views/css/views.module.css +++ b/core/modules/views/css/views.module.css @@ -8,11 +8,6 @@ .views-align-center { text-align: center; } - -.view .progress-disabled { - float: none; -} - /* Grid style column align. */ .views-view-grid .views-col { float: left; diff --git a/core/modules/views_ui/css/views_ui.admin.css b/core/modules/views_ui/css/views_ui.admin.css index 05b2d9a2b859..ebcacc5c1eac 100644 --- a/core/modules/views_ui/css/views_ui.admin.css +++ b/core/modules/views_ui/css/views_ui.admin.css @@ -286,18 +286,6 @@ div.form-item-options-value-all { } /* @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 */ .js-only { diff --git a/core/modules/views_ui/css/views_ui.admin.theme.css b/core/modules/views_ui/css/views_ui.admin.theme.css index b5f2a0398069..a4ebe73368cf 100644 --- a/core/modules/views_ui/css/views_ui.admin.theme.css +++ b/core/modules/views_ui/css/views_ui.admin.theme.css @@ -306,19 +306,6 @@ th.views-ui-operations { /* @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 */