Ticket #36861: 36861.diff

src/wp-includes/js/media/controllers/edit-image.js

@@ -33 +33 @@
          * @since 3.9.0
          */
         activate: function() {
-                this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
+                this.toolbar;
         },
 
         /**
@@ -40 +40 @@
          * @since 3.9.0
          */
         deactivate: function() {
-                this.stopListening( this.frame );
         },
 
         /**

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

@@ -458 +458 @@
                 url:     ''
         },
 
+
         /**
          * @since 3.9.0
          */
         activate: function() {
-                this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
+                this.toolbar();
         },
 
         /**
@@ -469 +470 @@
          * @since 3.9.0
          */
         deactivate: function() {
-                this.stopListening( this.frame );
         },
 
         /**