Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 23:57:41 +02:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
Props koopersmith
fixes #22632


git-svn-id: http://core.svn.wordpress.org/trunk@22938 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-11-30 01:55:37 +00:00
parent fccd72a74b
commit a986fd1509
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wp-includes/js/media-views.js
View File

@ -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;
}
});