<!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>[22790] trunk/wp-includes: Media: Make the window-wide uploader a subview of the frame view.</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/22790">22790</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-21 20:27:49 +0000 (Wed, 21 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Make the window-wide uploader a subview of the frame view.
Allows the uploader to leverage the ready event to know when it has been attached to the page.
see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</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 (22789 => 22790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-21 20:17:25 UTC (rev 22789)
+++ trunk/wp-includes/js/media-views.js 2012-11-21 20:27:49 UTC (rev 22790)
</span><span class="lines">@@ -1049,6 +1049,7 @@
</span><span class="cx"> container: this.$el
</span><span class="cx"> }
</span><span class="cx"> });
</span><ins>+ this.views.set( '.media-frame-uploader', this.uploader );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.on( 'attach', _.bind( this.views.ready, this.views ), this );
</span><span class="lines">@@ -1059,11 +1060,6 @@
</span><span class="cx"> this.modal.render();
</span><span class="cx">
</span><span class="cx"> media.view.Frame.prototype.render.apply( this, arguments );
</span><del>-
- // Render the window uploader if it exists.
- if ( this.uploader )
- this.uploader.render().$el.appendTo( this.$el );
-
</del><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1733,37 +1729,26 @@
</span><span class="cx"> params: {}
</span><span class="cx"> });
</span><span class="cx">
</span><del>- if ( uploader.dropzone ) {
- // Ensure the dropzone is a jQuery collection.
- if ( ! (uploader.dropzone instanceof $) )
- uploader.dropzone = $( uploader.dropzone );
-
- // Attempt to initialize the uploader whenever the dropzone is hovered.
- uploader.dropzone.one( 'mouseenter dragenter', _.bind( this.maybeInitUploader, this ) );
- }
</del><ins>+ // Ensure the dropzone is a jQuery collection.
+ if ( uploader.dropzone && ! (uploader.dropzone instanceof $) )
+ uploader.dropzone = $( uploader.dropzone );
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- render: function() {
- this.maybeInitUploader();
- this.$el.html( this.template( this.options ) );
- return this;
- },
-
</del><span class="cx"> refresh: function() {
</span><span class="cx"> if ( this.uploader )
</span><span class="cx"> this.uploader.refresh();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- maybeInitUploader: function() {
- var $id, dropzone;
</del><ins>+ ready: function() {
+ var postId = media.view.settings.postId,
+ dropzone;
</ins><span class="cx">
</span><del>- // If the uploader already exists or the body isn't in the DOM, bail.
- if ( this.uploader || ! this.$el.closest('body').length )
</del><ins>+ // If the uploader already exists, bail.
+ if ( this.uploader )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- $id = $('#post_ID');
- if ( $id.length )
- this.options.uploader.params.post_id = $id.val();
</del><ins>+ if ( postId )
+ this.options.uploader.params.post_id = postId;
</ins><span class="cx">
</span><span class="cx"> this.uploader = new wp.Uploader( this.options.uploader );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22789 => 22790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-21 20:17:25 UTC (rev 22789)
+++ trunk/wp-includes/media.php 2012-11-21 20:27:49 UTC (rev 22790)
</span><span class="lines">@@ -1406,6 +1406,7 @@
</span><span class="cx"> <div class="media-frame-content"></div>
</span><span class="cx"> <div class="media-frame-sidebar"></div>
</span><span class="cx"> <div class="media-frame-toolbar"></div>
</span><ins>+ <div class="media-frame-uploader"></div>
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-media-modal">
</span></span></pre>
</div>
</div>
</body>
</html>