From 0d020faa6883bce6f7eade35cbbd52f2106b1c22 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Fri, 10 Jun 2016 21:11:28 +0000 Subject: [PATCH] Media: Fix rendering of incorrect toolbar in the Edit view. This switches event binding in `wp.media.controller.EditImage` to use `on` instead of `listenTo` to restore rendering of the correct toolbar when the `toolbar:render:edit-image` event fires. The existing listeners broke when we upgraded Backbone in [36546]. Props adamsilverstein. Fixes #36861 for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@37678 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/media-views.js | 4 ++-- src/wp-includes/js/media/controllers/edit-image.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js index 91b5d3a5b7..596e4b0ba3 100644 --- a/src/wp-includes/js/media-views.js +++ b/src/wp-includes/js/media-views.js @@ -462,14 +462,14 @@ EditImage = wp.media.controller.State.extend({ * @since 3.9.0 */ activate: function() { - this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar ); + this.frame.on( 'toolbar:render:edit-image', _.bind( this.toolbar, this ) ); }, /** * @since 3.9.0 */ deactivate: function() { - this.stopListening( this.frame ); + this.frame.off( 'toolbar:render:edit-image' ); }, /** diff --git a/src/wp-includes/js/media/controllers/edit-image.js b/src/wp-includes/js/media/controllers/edit-image.js index 3c298982f2..448541f2f2 100644 --- a/src/wp-includes/js/media/controllers/edit-image.js +++ b/src/wp-includes/js/media/controllers/edit-image.js @@ -33,14 +33,14 @@ EditImage = wp.media.controller.State.extend({ * @since 3.9.0 */ activate: function() { - this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar ); + this.frame.on( 'toolbar:render:edit-image', _.bind( this.toolbar, this ) ); }, /** * @since 3.9.0 */ deactivate: function() { - this.stopListening( this.frame ); + this.frame.off( 'toolbar:render:edit-image' ); }, /**