WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects 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.

Built from https://develop.svn.wordpress.org/trunk@32502


git-svn-id: http://core.svn.wordpress.org/trunk@32472 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-05-13 21:27:27 +00:00
parent 1c40b495a1
commit 2f82bbb60d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,7 @@ SelectModeToggle = Button.extend({
// TODO: the Frame should be doing all of this. // TODO: the Frame should be doing all of this.
if ( this.controller.isModeActive( 'select' ) ) { if ( this.controller.isModeActive( 'select' ) ) {
this.model.set( 'text', l10n.cancelSelection ); this.model.set( 'text', l10n.cancelSelection );
children.not( '.media-button' ).hide(); children.not( '.spinner, .media-button' ).hide();
this.$el.show(); this.$el.show();
toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' ); toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
} else { } else {
@ -319,7 +319,7 @@ SelectModeToggle = Button.extend({
this.controller.content.get().$el.removeClass( 'fixed' ); this.controller.content.get().$el.removeClass( 'fixed' );
toolbar.$el.css( 'width', '' ); toolbar.$el.css( 'width', '' );
toolbar.$( '.delete-selected-button' ).addClass( 'hidden' ); toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
children.not( '.spinner, .media-button' ).show(); children.not( '.media-button' ).show();
this.controller.state().get( 'selection' ).reset(); this.controller.state().get( 'selection' ).reset();
} }
} }

2
wp-includes/js/media-grid.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32501'; $wp_version = '4.3-alpha-32502';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.