<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[22938] trunk/wp-includes/js/media-views.js: In the media modal, ensure modal events are always fired on its frame.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22938">22938</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-30 01:55:37 +0000 (Fri, 30 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/22632">#22632</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22937 => 22938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-30 01:38:41 UTC (rev 22937)
+++ trunk/wp-includes/js/media-views.js 2012-11-30 01:55:37 UTC (rev 22938)
</span><span class="lines">@@ -1216,7 +1216,6 @@
</span><span class="cx"> media.view.MediaFrame.prototype[ method ] = function( view ) {
</span><span class="cx"> if ( this.modal )
</span><span class="cx"> this.modal[ method ].apply( this.modal, arguments );
</span><del>- this.trigger( method );
</del><span class="cx"> return this;
</span><span class="cx"> };
</span><span class="cx"> });
</span><span class="lines">@@ -1657,7 +1656,8 @@
</span><span class="cx">
</span><span class="cx"> _.defaults( this.options, {
</span><span class="cx"> container: document.body,
</span><del>- title: ''
</del><ins>+ title: '',
+ propagate: true
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1680,26 +1680,22 @@
</span><span class="cx">
</span><span class="cx"> attach: function() {
</span><span class="cx"> this.$el.appendTo( this.options.container );
</span><del>- this.trigger('attach');
- return this;
</del><ins>+ return this.propagate('attach');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> detach: function() {
</span><span class="cx"> this.$el.detach();
</span><del>- this.trigger('detach');
- return this;
</del><ins>+ return this.propagate('detach');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> open: function() {
</span><span class="cx"> this.$el.show();
</span><del>- this.trigger('open');
- return this;
</del><ins>+ return this.propagate('open');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> close: function() {
</span><span class="cx"> this.$el.hide();
</span><del>- this.trigger('close');
- return this;
</del><ins>+ return this.propagate('close');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> closeHandler: function( event ) {
</span><span class="lines">@@ -1715,6 +1711,17 @@
</span><span class="cx"> // Set and render the content.
</span><span class="cx"> this.options.$content = ( $content instanceof Backbone.View ) ? $content.$el : $content;
</span><span class="cx"> return this.render();
</span><ins>+ },
+
+ // 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;
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>