From e238cac0ccb6fc3b3b84fa359c83e6c3183d8a7a Mon Sep 17 00:00:00 2001
From: "Dominik Schilling (ocean90)" <ocean90@git.wordpress.org>
Date: Wed, 24 Feb 2016 16:02:43 +0000
Subject: [PATCH] Media: Fix broken delete/trash functionality in the library
 after [36546].

Props imath.
See #34350.

git-svn-id: https://develop.svn.wordpress.org/trunk@36681 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/media-grid.js                     | 12 ++++++------
 .../views/button/delete-selected-permanently.js      |  4 ++--
 .../js/media/views/button/delete-selected.js         |  4 ++--
 .../js/media/views/button/select-mode-toggle.js      |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 01db38bad5..e29494f576 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -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 () {
diff --git a/src/wp-includes/js/media/views/button/delete-selected-permanently.js b/src/wp-includes/js/media/views/button/delete-selected-permanently.js
index da81ec5612..7c6a5e30bf 100644
--- a/src/wp-includes/js/media/views/button/delete-selected-permanently.js
+++ b/src/wp-includes/js/media/views/button/delete-selected-permanently.js
@@ -17,8 +17,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 ) {
diff --git a/src/wp-includes/js/media/views/button/delete-selected.js b/src/wp-includes/js/media/views/button/delete-selected.js
index 15685946ca..c9ee1b0261 100644
--- a/src/wp-includes/js/media/views/button/delete-selected.js
+++ b/src/wp-includes/js/media/views/button/delete-selected.js
@@ -17,9 +17,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 ) {
diff --git a/src/wp-includes/js/media/views/button/select-mode-toggle.js b/src/wp-includes/js/media/views/button/select-mode-toggle.js
index 89beee92c8..820e5ded48 100644
--- a/src/wp-includes/js/media/views/button/select-mode-toggle.js
+++ b/src/wp-includes/js/media/views/button/select-mode-toggle.js
@@ -18,8 +18,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 () {