Ticket #22632: 22632.diff

wp-includes/js/media-views.js

@@ -1216 +1216 @@
                 media.view.MediaFrame.prototype[ method ] = function( view ) {
                         if ( this.modal )
                                 this.modal[ method ].apply( this.modal, arguments );
-                        this.trigger( method );
                         return this;
                 };
         });
@@ -1657 +1656 @@
 
                         _.defaults( this.options, {
                                 container: document.body,
-                                title:     ''
+                                title:     '',
+                                propogate: true
                         });
                 },
 
@@ -1680 +1680 @@
 
                 attach: function() {
                         this.$el.appendTo( this.options.container );
-                        this.trigger('attach');
-                        return this;
+                        return this.propogate('attach');
                 },
 
                 detach: function() {
                         this.$el.detach();
-                        this.trigger('detach');
-                        return this;
+                        return this.propogate('detach');
                 },
 
                 open: function() {
                         this.$el.show();
-                        this.trigger('open');
-                        return this;
+                        return this.propogate('open');
                 },
 
                 close: function() {
                         this.$el.hide();
-                        this.trigger('close');
-                        return this;
+                        return this.propogate('close');
                 },
 
                 closeHandler: function( event ) {
@@ -1715 +1711 @@
                         // Set and render the content.
                         this.options.$content = ( $content instanceof Backbone.View ) ? $content.$el : $content;
                         return this.render();
+                },
+
+                // Triggers a modal event and if the `propogate` option is set,
+                // forwards events to the modal's controller.
+                propogate: function( id ) {
+                        this.trigger( id );
+
+                        if ( this.options.propogate )
+                                this.controller.trigger( id );
+
+                        return this;
                 }
         });