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

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

Fixes #39780.


git-svn-id: https://develop.svn.wordpress.org/trunk@40051 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2017-02-08 19:43:58 +00:00
parent baff296dfa
commit 87364b0586
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wp-includes/js/media-views.js
View File

@ -3956,7 +3956,9 @@ AttachmentsBrowser = View.extend({
controller: this.controller, controller: this.controller,
priority: -55, priority: -55,
click: function() { 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 ) ) { if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
return; return;
@ -3968,11 +3970,20 @@ AttachmentsBrowser = View.extend({
return; return;
} }
model.destroy(); destroy.push( model );
} ); } );
selection.remove( removed ); if ( removed.length ) {
this.controller.trigger( 'selection:action:done' ); 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() ); }).render() );
} }

19
src/wp-includes/js/media/views/attachments/browser.js
View File

@ -225,7 +225,9 @@ AttachmentsBrowser = View.extend({
controller: this.controller, controller: this.controller,
priority: -55, priority: -55,
click: function() { 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 ) ) { if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
return; return;
@ -237,11 +239,20 @@ AttachmentsBrowser = View.extend({
return; return;
} }
model.destroy(); destroy.push( model );
} ); } );
selection.remove( removed ); if ( removed.length ) {
this.controller.trigger( 'selection:action:done' ); 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() ); }).render() );
} }