From 6b972a4c53bf9589b03fc0f82c16734bf82c96eb Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Fri, 30 Nov 2012 01:55:37 +0000
Subject: [PATCH] In the media modal, ensure modal events are always fired on
 its frame. This ensures restoreThickbox() and thus tbRemove() are called
 properly when clicking the close button of the modal.

Props koopersmith
fixes #22632


git-svn-id: https://develop.svn.wordpress.org/trunk@22938 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/js/media-views.js | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
index e694c476c7..08170b9047 100644
--- a/wp-includes/js/media-views.js
+++ b/wp-includes/js/media-views.js
@@ -1216,7 +1216,6 @@
 		media.view.MediaFrame.prototype[ method ] = function( view ) {
 			if ( this.modal )
 				this.modal[ method ].apply( this.modal, arguments );
-			this.trigger( method );
 			return this;
 		};
 	});
@@ -1657,7 +1656,8 @@
 
 			_.defaults( this.options, {
 				container: document.body,
-				title:     ''
+				title:     '',
+				propagate: true
 			});
 		},
 
@@ -1680,26 +1680,22 @@
 
 		attach: function() {
 			this.$el.appendTo( this.options.container );
-			this.trigger('attach');
-			return this;
+			return this.propagate('attach');
 		},
 
 		detach: function() {
 			this.$el.detach();
-			this.trigger('detach');
-			return this;
+			return this.propagate('detach');
 		},
 
 		open: function() {
 			this.$el.show();
-			this.trigger('open');
-			return this;
+			return this.propagate('open');
 		},
 
 		close: function() {
 			this.$el.hide();
-			this.trigger('close');
-			return this;
+			return this.propagate('close');
 		},
 
 		closeHandler: function( event ) {
@@ -1715,6 +1711,17 @@
 			// 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 `propagate` option is set,
+		// forwards events to the modal's controller.
+		propagate: function( id ) {
+			this.trigger( id );
+
+			if ( this.options.propagate )
+				this.controller.trigger( id );
+
+			return this;
 		}
 	});