<!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>[22781] trunk/wp-includes/js/media-views.js: Media: Make the upload state a dedicated screen, instead of including its own library 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/22781">22781</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-21 18:29:53 +0000 (Wed, 21 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Make the upload state a dedicated screen, instead of including its own library view. 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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22780 => 22781)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-21 18:00:18 UTC (rev 22780)
+++ trunk/wp-includes/js/media-views.js 2012-11-21 18:29:53 UTC (rev 22781)
</span><span class="lines">@@ -444,29 +444,37 @@
</span><span class="cx">
</span><span class="cx"> // wp.media.controller.Upload
</span><span class="cx"> // ---------------------------
</span><del>- media.controller.Upload = media.controller.Library.extend({
</del><ins>+ media.controller.Upload = media.controller.State.extend({
</ins><span class="cx"> defaults: _.defaults({
</span><del>- id: 'upload',
- upload: { text: l10n.uploadMoreFiles },
- searchable: false,
- sortable: true
- }, media.controller.Library.prototype.defaults ),
</del><ins>+ id: 'upload',
+ content: 'upload',
+ sidebar: 'empty',
+ toolbar: 'empty',
</ins><span class="cx">
</span><ins>+ // The state to navigate to when files are uploading.
+ libraryState: 'library'
+ }, media.controller.State.prototype.defaults ),
+
</ins><span class="cx"> initialize: function() {
</span><del>- var library = this.get('library');
</del><ins>+ media.controller.State.prototype.initialize.apply( this, arguments );
+ },
</ins><span class="cx">
</span><del>- // If a `library` attribute isn't provided, create a new
- // `Attachments` collection that observes (and thereby receives
- // all uploading) attachments.
- if ( ! library ) {
- library = new Attachments();
- library.observe( wp.Uploader.queue );
- this.set( 'library', library );
- }
</del><ins>+ activate: function() {
+ wp.Uploader.queue.on( 'add', this.uploading, this );
+ media.controller.State.prototype.activate.apply( this, arguments );
+ },
</ins><span class="cx">
</span><del>- media.controller.Library.prototype.initialize.apply( this, arguments );
</del><ins>+ deactivate: function() {
+ wp.Uploader.queue.off( null, null, this );
+ media.controller.State.prototype.deactivate.apply( this, arguments );
+ },
+
+ uploading: function( attachment ) {
+ var library = this.get('libraryState');
+
+ this.frame.get( library ).get('selection').add( attachment );
+ this.frame.state( library );
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // wp.media.controller.Gallery
</span><span class="lines">@@ -1175,24 +1183,22 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createStates: function() {
</span><del>- var options = this.options,
- attributes;
</del><ins>+ var options = this.options;
</ins><span class="cx">
</span><del>- attributes = {
- multiple: this.options.multiple,
- menu: 'main',
- toolbar: 'select'
- };
-
</del><span class="cx"> // Add the default states.
</span><span class="cx"> this.states.add([
</span><span class="cx"> // Main states.
</span><span class="cx"> new media.controller.Library( _.defaults({
</span><span class="cx"> selection: options.selection,
</span><del>- library: media.query( options.library )
</del><ins>+ library: media.query( options.library ),
+ multiple: this.options.multiple,
+ menu: 'main',
+ toolbar: 'select'
</ins><span class="cx"> }, attributes ) ),
</span><span class="cx">
</span><del>- new media.controller.Upload( attributes )
</del><ins>+ new media.controller.Upload({
+ menu: 'main'
+ })
</ins><span class="cx"> ]);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1245,7 +1251,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> uploadContent: function() {
</span><del>- // In the meantime, render an inline uploader.
</del><ins>+ this.$el.addClass('hide-sidebar hide-toolbar');
+
</ins><span class="cx"> this.content.view( new media.view.UploaderInline({
</span><span class="cx"> controller: this
</span><span class="cx"> }) );
</span><span class="lines">@@ -1342,38 +1349,29 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createStates: function() {
</span><del>- var options = this.options,
- main, gallery;
</del><ins>+ var options = this.options;
</ins><span class="cx">
</span><del>- main = {
- multiple: this.options.multiple,
- menu: 'main',
- sidebar: 'attachment-settings',
-
- // Update user settings when users adjust the
- // attachment display settings.
- displayUserSettings: true
- };
-
- gallery = {
- multiple: true,
- menu: 'gallery',
- toolbar: 'gallery-add',
- excludeState: 'gallery-edit'
- };
-
</del><span class="cx"> // Add the default states.
</span><span class="cx"> this.states.add([
</span><span class="cx"> // Main states.
</span><del>- new media.controller.Library( _.defaults({
</del><ins>+ new media.controller.Library({
</ins><span class="cx"> selection: options.selection,
</span><span class="cx"> library: media.query( options.library ),
</span><span class="cx"> editable: true,
</span><del>- filterable: 'all'
- }, main ) ),
</del><ins>+ filterable: 'all',
+ multiple: this.options.multiple,
+ menu: 'main',
+ sidebar: 'attachment-settings',
</ins><span class="cx">
</span><del>- new media.controller.Upload( main ),
</del><ins>+ // Update user settings when users adjust the
+ // attachment display settings.
+ displayUserSettings: true
+ }),
</ins><span class="cx">
</span><ins>+ new media.controller.Upload({
+ menu: 'main'
+ }),
+
</ins><span class="cx"> // Embed states.
</span><span class="cx"> new media.controller.Embed(),
</span><span class="cx">
</span><span class="lines">@@ -1384,15 +1382,21 @@
</span><span class="cx"> menu: 'gallery'
</span><span class="cx"> }),
</span><span class="cx">
</span><del>- new media.controller.Library( _.defaults({
- id: 'gallery-library',
- library: media.query({ type: 'image' }),
- filterable: 'uploaded'
- }, gallery ) ),
</del><ins>+ new media.controller.Library({
+ id: 'gallery-library',
+ library: media.query({ type: 'image' }),
+ filterable: 'uploaded',
+ multiple: true,
+ menu: 'gallery',
+ toolbar: 'gallery-add',
+ excludeState: 'gallery-edit'
+ }),
</ins><span class="cx">
</span><del>- new media.controller.Upload( _.defaults({
- id: 'gallery-upload'
- }, gallery ) )
</del><ins>+ new media.controller.Upload({
+ id: 'gallery-upload',
+ menu: 'gallery',
+ libraryState: 'gallery-edit'
+ })
</ins><span class="cx"> ]);
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>