Changeset 36681

Timestamp:

02/24/2016 04:02:43 PM (4 years ago)

Author:

ocean90

Message:

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

Props imath.
See #34350.

Location:

trunk/src/wp-includes/js

Files:

• media-grid.js (modified) (3 diffs)
• media/views/button/delete-selected-permanently.js (modified) (1 diff)
• media/views/button/delete-selected.js (modified) (1 diff)
• media/views/button/select-mode-toggle.js (modified) (1 diff)

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

@@ -151 +151 @@
     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 );
     },
 
@@ -198 +198 @@
         Button.prototype.initialize.apply( this, arguments );
         if ( this.options.filters ) {
-            this.listenTo( this.options.filters.model, 'change', this.filterChange );
-        }
-        this.listenTo( this.controller, 'selection:toggle', this.toggleDisabled );
+            this.options.filters.model.on( 'change', this.filterChange, this );
+        }
+        this.controller.on( 'selection:toggle', this.toggleDisabled, this );
     },
 
@@ -252 +252 @@
 
         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 );
     },
 

trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js

@@ -18 +18 @@
     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 );
     },
 

trunk/src/wp-includes/js/media/views/button/delete-selected.js

@@ -18 +18 @@
         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 );
     },
 

trunk/src/wp-includes/js/media/views/button/select-mode-toggle.js

@@ -19 +19 @@
 
         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 );
     },