Ticket #36861: 36861.2.diff

src/wp-includes/js/media-views.js

@@ -462 +462 @@
          * @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 ) );
         },
 
         /**
@@ -469 +469 @@
          * @since 3.9.0
          */
         deactivate: function() {
-                this.stopListening( this.frame );
+                this.frame.off( 'toolbar:render:edit-image' );
         },
 
         /**