sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.


git-svn-id: https://develop.svn.wordpress.org/trunk@32502 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-05-13 21:26:22 +00:00
parent 8bcd566ee0
commit 23e40ef756
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/js/media-grid.js
View File

@ -311,7 +311,7 @@ SelectModeToggle = Button.extend({
// TODO: the Frame should be doing all of this.
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' );
} else {
@ -319,7 +319,7 @@ SelectModeToggle = Button.extend({
this.controller.content.get().$el.removeClass( 'fixed' );
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();
}
}

4
src/wp-includes/js/media/views/button/select-mode-toggle.js
View File

@ -47,7 +47,7 @@ SelectModeToggle = Button.extend({
// TODO: the Frame should be doing all of this.
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' );
} else {
@ -55,7 +55,7 @@ SelectModeToggle = Button.extend({
this.controller.content.get().$el.removeClass( 'fixed' );
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();
}
}