<!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>[22945] trunk/wp-includes: Improve switching between browser and upload state.</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/22945">22945</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-30 06:01:47 +0000 (Fri, 30 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve switching between browser and upload state.
Props koopersmith
fixes <a href="http://core.trac.wordpress.org/ticket/22628">#22628</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22944 => 22945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-11-30 05:39:13 UTC (rev 22944)
+++ trunk/wp-includes/css/media-views.css 2012-11-30 06:01:47 UTC (rev 22945)
</span><span class="lines">@@ -726,7 +726,8 @@
</span><span class="cx"> margin-top: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachments-browser .attachments {
</del><ins>+.attachments-browser .attachments,
+.attachments-browser .uploader-inline {
</ins><span class="cx"> position: absolute;
</span><span class="cx"> top: 50px;
</span><span class="cx"> left: 0;
</span><span class="lines">@@ -931,7 +932,7 @@
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.region-content.uploader-inline {
</del><ins>+.media-frame .uploader-inline {
</ins><span class="cx"> margin: 20px;
</span><span class="cx"> padding: 20px;
</span><span class="cx"> text-align: center;
</span><span class="lines">@@ -1373,6 +1374,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .attachments-browser .attachments,
</span><ins>+ .attachments-browser .uploader-inline,
</ins><span class="cx"> .attachments-browser .media-toolbar {
</span><span class="cx"> right: 180px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22944 => 22945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-30 05:39:13 UTC (rev 22944)
+++ trunk/wp-includes/js/media-views.js 2012-11-30 06:01:47 UTC (rev 22945)
</span><span class="lines">@@ -262,6 +262,7 @@
</span><span class="cx"> describe: false,
</span><span class="cx"> toolbar: 'main-attachments',
</span><span class="cx"> sidebar: 'settings',
</span><ins>+ content: 'browse',
</ins><span class="cx"> searchable: true,
</span><span class="cx"> filterable: false,
</span><span class="cx"> uploads: true
</span><span class="lines">@@ -304,19 +305,11 @@
</span><span class="cx">
</span><span class="cx"> selection.on( 'add remove reset', this.refreshSelection, this );
</span><span class="cx">
</span><del>- this._updateEmpty();
- library.on( 'add remove reset', this._updateEmpty, this );
- this.on( 'change:empty', this.refresh, this );
</del><span class="cx"> this.refresh();
</span><del>-
-
</del><span class="cx"> this.on( 'insert', this._insertDisplaySettings, this );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> deactivate: function() {
</span><del>- this.off( 'change:empty', this.refresh, this );
- this.get('library').off( 'add remove reset', this._updateEmpty, this );
-
</del><span class="cx"> // Unbind all event handlers that use this state as the context
</span><span class="cx"> // from the selection.
</span><span class="cx"> this.get('selection').off( null, null, this );
</span><span class="lines">@@ -334,23 +327,7 @@
</span><span class="cx"> this.resetDisplays();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- content: function() {
- var frame = this.frame;
-
- if ( this.get('empty') ) {
- // Attempt to fetch any Attachments we don't already have.
- this.get('library').more();
-
- // In the meantime, render an inline uploader.
- frame.content.mode('upload');
- } else {
- // Browse our library of attachments.
- frame.content.mode('browse');
- }
- },
-
</del><span class="cx"> refresh: function() {
</span><del>- this.frame.$el.toggleClass( 'hide-toolbar', this.get('empty') );
</del><span class="cx"> this.content();
</span><span class="cx"> this.refreshSelection();
</span><span class="cx"> },
</span><span class="lines">@@ -389,17 +366,6 @@
</span><span class="cx"> setUserSetting( 'urlbutton', display.link );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _updateEmpty: function() {
- var library = this.get('library'),
- props = library.props;
-
- // If we're filtering the library, bail.
- if ( this.get('filterable') && ( props.get('type') || props.get('parent') ) )
- return;
-
- this.set( 'empty', ! library.length && ! library.props.get('search') );
- },
-
</del><span class="cx"> refreshSelection: function() {
</span><span class="cx"> var selection = this.get('selection'),
</span><span class="cx"> mode = this.frame.content.mode();
</span><span class="lines">@@ -524,7 +490,8 @@
</span><span class="cx"> editing: false,
</span><span class="cx"> sortable: true,
</span><span class="cx"> searchable: false,
</span><del>- toolbar: 'gallery-edit'
</del><ins>+ toolbar: 'gallery-edit',
+ content: 'browse'
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="lines">@@ -1301,6 +1268,8 @@
</span><span class="cx"> browseContent: function() {
</span><span class="cx"> var state = this.state();
</span><span class="cx">
</span><ins>+ this.$el.removeClass('hide-toolbar');
+
</ins><span class="cx"> // Browse our library of attachments.
</span><span class="cx"> this.content.view( new media.view.AttachmentsBrowser({
</span><span class="cx"> controller: this,
</span><span class="lines">@@ -3017,8 +2986,10 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.createToolbar();
</span><del>- this.createAttachments();
</del><ins>+ this.updateContent();
</ins><span class="cx"> this.createSidebar();
</span><ins>+
+ this.collection.on( 'add remove reset', this.updateContent, this );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> dispose: function() {
</span><span class="lines">@@ -3066,7 +3037,39 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ updateContent: function() {
+ var view = this;
+
+ if( ! this.attachments )
+ this.createAttachments();
+
+ if ( ! this.collection.length ) {
+ this.collection.more().done( function() {
+ if ( ! view.collection.length )
+ view.createUploader();
+ });
+ }
+ },
+
+ createUploader: function() {
+ if ( this.attachments ) {
+ this.attachments.remove();
+ delete this.attachments;
+ }
+
+ this.uploader = new media.view.UploaderInline({
+ controller: this.controller
+ });
+
+ this.views.add( this.uploader );
+ },
+
</ins><span class="cx"> createAttachments: function() {
</span><ins>+ if ( this.uploader ) {
+ this.uploader.remove();
+ delete this.uploader;
+ }
+
</ins><span class="cx"> this.attachments = new media.view.Attachments({
</span><span class="cx"> controller: this.controller,
</span><span class="cx"> collection: this.collection,
</span></span></pre>
</div>
</div>
</body>
</html>