Changeset 29566

Timestamp:

08/21/2014 04:19:40 AM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid: after completing a Bulk action, switch from select to edit mode.

Fixes #28842.

Location:

trunk/src/wp-includes/js

Files:

• media-grid.js (modified) (3 diffs)
• media-views.js (modified) (2 diffs)

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

@@ -137 +137 @@
                     contentUserSetting: false,
                     filterable:         'all',
-                    autoSelect:         false 
+                    autoSelect:         false
                 })
             ]);
@@ -584 +584 @@
             media.view.Button.prototype.initialize.apply( this, arguments );
             this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
+            this.listenTo( this.controller, 'selection:action:done', this.back );
+        },
+
+        back: function () {
+            this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
         },
 
@@ -589 +594 @@
             media.view.Button.prototype.click.apply( this, arguments );
             if ( this.controller.isModeActive( 'select' ) ) {
-                this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
+                this.back();
             } else {
                 this.controller.deactivateMode( 'edit' ).activateMode( 'select' );

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

@@ -5865 +5865 @@
                     priority: -60,
                     click: function() {
-                        var model, changed = [],
+                        var model, changed = [], self = this,
                             selection = this.controller.state().get( 'selection' ),
                             library = this.controller.state().get( 'library' );
@@ -5902 +5902 @@
                             $.when.apply( null, changed ).then( function() {
                                 library._requery( true );
+                                self.controller.trigger( 'selection:action:done' );
                             } );
                         }