Changeset 32502

Timestamp:

05/13/2015 09:26:22 PM (11 years ago)

Author:

wonderboymusic

Message:

In views/button/select-mode-toggle, don't hide the spinner with JS. This oversight is a symptom of the too-aggressive outside DOM handling that is happening in this view's toggleBulkEditHandler method.

Props afercia.
Fixes #32324.

Location:

trunk/src/wp-includes/js

Files:

• media-grid.js (modified) (2 diffs)
• media/views/button/select-mode-toggle.js (modified) (2 diffs)

trunk/src/wp-includes/js/media-grid.js

@@ -312 +312 @@
                 if ( this.controller.isModeActive( 'select' ) ) {
                         this.model.set( 'text', l10n.cancelSelection );
-                        children.not( '.media-button' ).hide();
+                        children.not( '.spinner, .media-button' ).hide();
                         this.$el.show();
                         toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
@@ -320 +320 @@
                         toolbar.$el.css( 'width', '' );
                         toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
-                        children.not( '.spinner, .media-button' ).show();
+                        children.not( '.media-button' ).show();
                         this.controller.state().get( 'selection' ).reset();
                 }

trunk/src/wp-includes/js/media/views/button/select-mode-toggle.js

@@ -48 +48 @@
                 if ( this.controller.isModeActive( 'select' ) ) {
                         this.model.set( 'text', l10n.cancelSelection );
-                        children.not( '.media-button' ).hide();
+                        children.not( '.spinner, .media-button' ).hide();
                         this.$el.show();
                         toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
@@ -56 +56 @@
                         toolbar.$el.css( 'width', '' );
                         toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
-                        children.not( '.spinner, .media-button' ).show();
+                        children.not( '.media-button' ).show();
                         this.controller.state().get( 'selection' ).reset();
                 }