<!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>[22335] trunk/wp-includes: Media JS: Improve handling of single attachments in selections.</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/22335">22335</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-30 23:15:16 +0000 (Tue, 30 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media JS: Improve handling of single attachments in selections.
* Adds `wp.media.model.Selection.single()` to specify a single item used in a multi-item selection.
* Fixes a bug where the `details` class would not be removed when "Clear Selection" was clicked.
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="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.js</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 (22334 => 22335)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-10-30 22:58:31 UTC (rev 22334)
+++ trunk/wp-includes/css/media-views.css 2012-10-30 23:15:16 UTC (rev 22335)
</span><span class="lines">@@ -244,7 +244,6 @@
</span><span class="cx"> text-shadow: 0 1px 0 rgba( 0, 0, 0, 0.5 );
</span><span class="cx"> background: #777;
</span><span class="cx"> border: 1px solid #fff;
</span><del>- /*border-width: 0 1px 1px 0;*/
</del><span class="cx"> border-width: 0 0 1px 1px;
</span><span class="cx"> box-shadow: -1px 1px 0 rgba( 0, 0, 0, 0.1 );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.js (22334 => 22335)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-10-30 22:58:31 UTC (rev 22334)
+++ trunk/wp-includes/js/media-models.js 2012-10-30 23:15:16 UTC (rev 22335)
</span><span class="lines">@@ -622,6 +622,11 @@
</span><span class="cx"> initialize: function( models, options ) {
</span><span class="cx"> Attachments.prototype.initialize.apply( this, arguments );
</span><span class="cx"> this.multiple = options && options.multiple;
</span><ins>+
+ // Refresh the `single` model whenever the selection changes.
+ // Binds `single` instead of using the context argument to ensure
+ // it receives no parameters.
+ this.on( 'add remove reset', _.bind( this.single, this ) );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Override the selection's add method.
</span><span class="lines">@@ -638,14 +643,16 @@
</span><span class="cx">
</span><span class="cx"> // Removes all models from the selection.
</span><span class="cx"> clear: function( options ) {
</span><del>- return this.remove( this.models, options );
</del><ins>+ this.remove( this.models, options ).single();
+ return this;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Override the selection's reset method.
</span><span class="cx"> // Always direct items through add and remove,
</span><span class="cx"> // as we need them to fire.
</span><span class="cx"> reset: function( models, options ) {
</span><del>- return this.clear( options ).add( models, options );
</del><ins>+ this.clear( options ).add( models, options ).single();
+ return this;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Create selection.has, which determines if a model
</span><span class="lines">@@ -653,6 +660,31 @@
</span><span class="cx"> // instead of direct comparison.
</span><span class="cx"> has: function( attachment ) {
</span><span class="cx"> return !! ( this.getByCid( attachment.cid ) || this.get( attachment.id ) );
</span><ins>+ },
+
+ single: function( model ) {
+ var previous = this._single;
+
+ // If a `model` is provided, use it as the single model.
+ if ( model )
+ this._single = model;
+
+ // If the single model isn't in the selection, remove it.
+ if ( this._single && ! this.has( this._single ) )
+ delete this._single;
+
+ this._single = this._single || this.last();
+
+ // If single has changed, fire an event.
+ if ( this._single !== previous ) {
+ if ( this._single )
+ this._single.trigger( 'selection:single', this._single, this );
+ if ( previous )
+ previous.trigger( 'selection:unsingle', previous, this );
+ }
+
+ // Return the single model, or the last model as a fallback.
+ return this._single;
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22334 => 22335)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-10-30 22:58:31 UTC (rev 22334)
+++ trunk/wp-includes/js/media-views.js 2012-10-30 23:15:16 UTC (rev 22335)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> details: function( options ) {
</span><del>- var model = this.get('details'),
</del><ins>+ var model = this.get('selection').single(),
</ins><span class="cx"> view;
</span><span class="cx">
</span><span class="cx"> if ( model ) {
</span><span class="lines">@@ -232,34 +232,18 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> toggleSelection: function( model ) {
</span><del>- var details = this.get('details'),
- selection = this.get('selection'),
- selected = selection.has( model );
</del><ins>+ var selection = this.get('selection');
</ins><span class="cx">
</span><del>- if ( ! selection )
- return;
-
- if ( ! selected )
- selection.add( model );
-
- // If the model is not the same as the details model,
- // it now becomes the details model. If the model is
- // in the selection, it is not removed.
- if ( details !== model ) {
- this.set( 'details', model );
- return;
</del><ins>+ if ( selection.has( model ) ) {
+ // If the model is the single model, remove it.
+ // If it is not the same as the single model,
+ // it now becomes the single model.
+ selection[ selection.single() === model ? 'remove' : 'single' ]( model );
+ } else {
+ selection.add( model ).single();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // The model is the details model.
- // Removed it from the selection.
- selection.remove( model );
-
- // Show the last selected item, or clear the details view.
- if ( selection.length )
- this.set( 'details', selection.last() );
- else
- this.unset('details');
-
</del><ins>+ return this;
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -1087,14 +1071,14 @@
</span><span class="cx"> this.select();
</span><span class="cx">
</span><span class="cx"> // Update the model's details view.
</span><del>- this.controller.state().on( 'change:details', this.details, this );
</del><ins>+ this.model.on( 'selection:single selection:unsingle', this.details, this );
</ins><span class="cx"> this.details();
</span><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> destroy: function() {
</span><del>- this.controller.state().off( 'change:details', this.details, this );
</del><ins>+ this.model.off( 'single', this.details, this );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> progress: function() {
</span><span class="lines">@@ -1136,8 +1120,14 @@
</span><span class="cx"> this.$el.removeClass('selected');
</span><span class="cx"> },
</span><span class="cx">
</span><del>- details: function() {
- var details = this.controller.state().get('details');
</del><ins>+ details: function( model, collection ) {
+ var selection = this.controller.state().get('selection'),
+ details;
+
+ if ( selection !== collection )
+ return;
+
+ details = selection.single();
</ins><span class="cx"> this.$el.toggleClass( 'details', details === this.model );
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>