Changeset 40051

Timestamp:

02/08/2017 07:43:58 PM (8 years ago)

Author:

wonderboymusic

Message:

Media: in wp.media.view.DeleteSelectedPermanentlyButton, move destructive async operations outside of the selection loop.

Fixes #39780.

Location:

trunk/src/wp-includes/js

Files:

• media-views.js (modified) (2 diffs)
• media/views/attachments/browser.js (modified) (2 diffs)

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

@@ -3957 +3957 @@
                     priority: -55,
                     click: function() {
-                        var removed = [], selection = this.controller.state().get( 'selection' );
+                        var removed = [],
+                            destroy = [],
+                            selection = this.controller.state().get( 'selection' );
 
                         if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
@@ -3969 +3971 @@
                             }
 
-                            model.destroy();
+                            destroy.push( model );
                         } );
 
-                        selection.remove( removed );
-                        this.controller.trigger( 'selection:action:done' );
+                        if ( removed.length ) {
+                            selection.remove( removed );
+                        }
+
+                        if ( destroy.length ) {
+                            $.when.apply( null, destroy.map( function (item) {
+                                return item.destroy();
+                            } ) ).then( _.bind( function() {
+                                this.controller.trigger( 'selection:action:done' );
+                            }, this ) );
+                        }
                     }
                 }).render() );

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

@@ -226 +226 @@
                     priority: -55,
                     click: function() {
-                        var removed = [], selection = this.controller.state().get( 'selection' );
+                        var removed = [],
+                            destroy = [],
+                            selection = this.controller.state().get( 'selection' );
 
                         if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
@@ -238 +240 @@
                             }
 
-                            model.destroy();
+                            destroy.push( model );
                         } );
 
-                        selection.remove( removed );
-                        this.controller.trigger( 'selection:action:done' );
+                        if ( removed.length ) {
+                            selection.remove( removed );
+                        }
+
+                        if ( destroy.length ) {
+                            $.when.apply( null, destroy.map( function (item) {
+                                return item.destroy();
+                            } ) ).then( _.bind( function() {
+                                this.controller.trigger( 'selection:action:done' );
+                            }, this ) );
+                        }
                     }
                 }).render() );