WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Fix broken delete/trash functionality in the library after [36546]. 

Props imath.
See #34350.
Built from https://develop.svn.wordpress.org/trunk@36681


git-svn-id: http://core.svn.wordpress.org/trunk@36648 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-02-24 16:03:26 +00:00
parent d90a013437
commit 34331fc574
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,8 +150,8 @@ var Button = wp.media.view.Button,
DeleteSelectedPermanently = DeleteSelected.extend({
initialize: function() {
DeleteSelected.prototype.initialize.apply( this, arguments );
this.listenTo( this.controller, 'select:activate', this.selectActivate );
this.listenTo( this.controller, 'select:deactivate', this.selectDeactivate );
this.controller.on( 'select:activate', this.selectActivate, this );
this.controller.on( 'select:deactivate', this.selectDeactivate, this );
},
filterChange: function( model ) {
@ -197,9 +197,9 @@ DeleteSelected = Button.extend({
initialize: function() {
Button.prototype.initialize.apply( this, arguments );
if ( this.options.filters ) {
this.listenTo( this.options.filters.model, 'change', this.filterChange );
this.options.filters.model.on( 'change', this.filterChange, this );
}
this.listenTo( this.controller, 'selection:toggle', this.toggleDisabled );
this.controller.on( 'selection:toggle', this.toggleDisabled, this );
},
filterChange: function( model ) {
@ -251,8 +251,8 @@ SelectModeToggle = Button.extend({
} );
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 );
this.controller.on( 'select:activate select:deactivate', this.toggleBulkEditHandler, this );
this.controller.on( 'selection:action:done', this.back, this );
},
back: function () {

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
*/
$wp_version = '4.5-alpha-36680';
$wp_version = '4.5-alpha-36681';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.