<!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>[22322] trunk/wp-includes: Add inline uploader UI to media modal sidebar.</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/22322">22322</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-29 07:38:13 +0000 (Mon, 29 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add inline uploader UI to media modal sidebar. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</a></li>
<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="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22321 => 22322)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-10-29 06:56:23 UTC (rev 22321)
+++ trunk/wp-includes/css/media-views.css 2012-10-29 07:38:13 UTC (rev 22322)
</span><span class="lines">@@ -133,6 +133,7 @@
</span><span class="cx">
</span><span class="cx"> .media-sidebar .sidebar-content {
</span><span class="cx"> padding: 0 10px;
</span><ins>+ margin-bottom: 130px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-sidebar .search {
</span><span class="lines">@@ -485,7 +486,7 @@
</span><span class="cx"> max-width: 300px;
</span><span class="cx"> background: transparent;
</span><span class="cx"> border-color: #fff;
</span><del>- /*display: none;*/
</del><ins>+ display: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .uploader-window .media-progress-bar div {
</span><span class="lines">@@ -496,6 +497,37 @@
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.uploader-inline {
+ display: none;
+}
+
+.uploader-inline .media-progress-bar {
+ display: none;
+}
+
+.uploading.uploader-inline .media-progress-bar {
+ display: block;
+}
+
+.media-sidebar .uploader-inline {
+ display: block;
+ position: absolute;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ height: 100px;
+ margin: 10px;
+ padding-top: 10px;
+ text-align: center;
+ border: 1px dashed #aaa;
+}
+
+.media-sidebar .uploader-inline h3 {
+ font-weight: 200;
+ font-size: 16px;
+ margin: 10px 0;
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Selection Preview
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22321 => 22322)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-10-29 06:56:23 UTC (rev 22321)
+++ trunk/wp-includes/js/media-views.js 2012-10-29 07:38:13 UTC (rev 22322)
</span><span class="lines">@@ -499,17 +499,20 @@
</span><span class="cx"> var uploader;
</span><span class="cx">
</span><span class="cx"> this.controller = this.options.controller;
</span><ins>+ this.inline = new media.view.UploaderInline({
+ controller: this.controller,
+ uploaderWindow: this
+ }).render();
</ins><span class="cx">
</span><ins>+ this.inline.$el.appendTo('body');
+
</ins><span class="cx"> uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
</span><del>- container: this.$el,
</del><ins>+ container: this.inline.$el,
</ins><span class="cx"> dropzone: this.$el,
</span><del>- browser: this.$('.upload-attachments a'),
</del><ins>+ browser: this.inline.$('.browser'),
</ins><span class="cx"> params: {}
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Track uploading attachments.
- wp.Uploader.queue.on( 'add remove reset change:percent', this.renderUploadProgress, this );
-
</del><span class="cx"> if ( uploader.dropzone ) {
</span><span class="cx"> // Ensure the dropzone is a jQuery collection.
</span><span class="cx"> if ( ! (uploader.dropzone instanceof $) )
</span><span class="lines">@@ -522,12 +525,15 @@
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><span class="cx"> this.maybeInitUploader();
</span><del>- this.renderUploadProgress();
</del><span class="cx"> this.$el.html( this.template( this.options ) );
</span><del>- this.$bar = this.$('.upload-attachments .media-progress-bar div');
</del><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ refresh: function() {
+ if ( this.uploader )
+ this.uploader.refresh();
+ },
+
</ins><span class="cx"> maybeInitUploader: function() {
</span><span class="cx"> var $id, dropzone;
</span><span class="cx">
</span><span class="lines">@@ -565,8 +571,32 @@
</span><span class="cx"> if ( '0' === $el.css('opacity') )
</span><span class="cx"> $el.hide();
</span><span class="cx"> });
</span><ins>+ }
+ });
+
+ media.view.UploaderInline = Backbone.View.extend({
+ tagName: 'div',
+ className: 'uploader-inline',
+ template: media.template('uploader-inline'),
+
+ initialize: function() {
+ this.controller = this.options.controller;
+
+ // Track uploading attachments.
+ wp.Uploader.queue.on( 'add remove reset change:percent', this.renderUploadProgress, this );
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ destroy: function() {
+ wp.Uploader.queue.off( 'add remove reset change:percent', this.renderUploadProgress, this );
+ },
+
+ render: function() {
+ this.renderUploadProgress();
+ this.$el.html( this.template( this.options ) );
+ this.$bar = this.$('.media-progress-bar div');
+ return this;
+ },
+
</ins><span class="cx"> renderUploadProgress: function() {
</span><span class="cx"> var queue = wp.Uploader.queue;
</span><span class="cx">
</span><span class="lines">@@ -910,6 +940,11 @@
</span><span class="cx">
</span><span class="cx"> this.$('.sidebar-content').html( els );
</span><span class="cx">
</span><ins>+ if ( this.controller.uploader ) {
+ this.$el.append( this.controller.uploader.inline.$el );
+ this.controller.uploader.refresh();
+ }
+
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22321 => 22322)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-10-29 06:56:23 UTC (rev 22321)
+++ trunk/wp-includes/media.php 2012-10-29 07:38:13 UTC (rev 22322)
</span><span class="lines">@@ -1309,6 +1309,13 @@
</span><span class="cx"> </div>
</span><span class="cx"> </script>
</span><span class="cx">
</span><ins>+ <script type="text/html" id="tmpl-uploader-inline">
+ <h3><?php _e( 'Drop files here' ); ?></h3>
+ <!--<span><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></span>-->
+ <a href="#" class="browser button-secondary"><?php _e( 'Select Files' ); ?></a>
+ <div class="media-progress-bar"><div></div></div>
+ </script>
+
</ins><span class="cx"> <script type="text/html" id="tmpl-sidebar">
</span><span class="cx"> <h2 class="sidebar-title"><%- title %></h2>
</span><span class="cx"> <div class="sidebar-content"></div>
</span></span></pre>
</div>
</div>
</body>
</html>