<!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>[22332] trunk/wp-includes: Improve selection UI/behavior in the media modal.</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/22332">22332</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-30 21:09:45 +0000 (Tue, 30 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve selection UI/behavior in the media modal.
* Moves handling which models are in the selection into the `Library` state.
* Adds highlight for the last-selected view in a multi-view state.
* A view must be the last-selected view before it can be deselected.
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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22331 => 22332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-10-30 20:58:35 UTC (rev 22331)
+++ trunk/wp-includes/css/media-views.css 2012-10-30 21:09:45 UTC (rev 22332)
</span><span class="lines">@@ -216,21 +216,43 @@
</span><span class="cx"> user-select: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.selected.attachment {
+ box-shadow:
+ 0 0 0 1px #fff,
+ 0 0 0 4px #777;
+}
+
+.details.attachment {
+ box-shadow:
+ 0 0 0 1px #fff,
+ 0 0 0 4px #1e8cbe;
+}
+
+
</ins><span class="cx"> .attachment.library.selected:after {
</span><span class="cx"> content: '\2713';
</span><span class="cx"> display: block;
</span><span class="cx"> height: 24px;
</span><span class="cx"> width: 24px;
</span><span class="cx"> position: absolute;
</span><del>- top: 0;
- left: 0;
</del><ins>+ top: -1px;
+ right: -1px;
</ins><span class="cx"> line-height: 24px;
</span><span class="cx"> font-size: 18px;
</span><span class="cx"> text-align: center;
</span><span class="cx"> color: #fff;
</span><del>- background: #21759b;
</del><ins>+ text-shadow: 0 1px 0 rgba( 0, 0, 0, 0.5 );
+ background: #777;
+ border: 1px solid #fff;
+ /*border-width: 0 1px 1px 0;*/
+ border-width: 0 0 1px 1px;
+ box-shadow: -1px 1px 0 rgba( 0, 0, 0, 0.1 );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.attachment.library.details:after {
+ background: #1e8cbe;
+}
+
</ins><span class="cx"> .attachment-preview {
</span><span class="cx"> position: relative;
</span><span class="cx"> width: 199px;
</span><span class="lines">@@ -278,6 +300,12 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.attachment.selected .attachment-preview:after {
+ box-shadow:
+ inset 0 0 0 1px rgba( 0, 0, 0, 0.1 ),
+ inset 0 0 10px 5px rgba( 0, 0, 0, 0.2 );
+}
+
</ins><span class="cx"> .attachment .thumbnail img {
</span><span class="cx"> top: 0;
</span><span class="cx"> left: 0;
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22331 => 22332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-10-30 20:58:35 UTC (rev 22331)
+++ trunk/wp-includes/js/media-views.js 2012-10-30 21:09:45 UTC (rev 22332)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> this.set( 'edge', 120 );
</span><span class="cx">
</span><span class="cx"> if ( ! this.get('gutter') )
</span><del>- this.set( 'gutter', 6 );
</del><ins>+ this.set( 'gutter', 8 );
</ins><span class="cx">
</span><span class="cx"> this.on( 'activate', this.activate, this );
</span><span class="cx"> this.on( 'deactivate', this.deactivate, this );
</span><span class="lines">@@ -147,8 +147,6 @@
</span><span class="cx"> // automatically select any uploading attachments.
</span><span class="cx"> if ( this.get('multiple') )
</span><span class="cx"> wp.Uploader.queue.on( 'add', this.selectUpload, this );
</span><del>-
- this.get('selection').on( 'add remove', this.toggleDetails, this );
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> deactivate: function() {
</span><span class="lines">@@ -157,7 +155,6 @@
</span><span class="cx"> this.get('selection').off( 'add remove', toolbar.visibility, toolbar );
</span><span class="cx">
</span><span class="cx"> wp.Uploader.queue.off( 'add', this.selectUpload, this );
</span><del>- this.get('selection').off( 'add remove', this.toggleDetails, this );
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> toolbar: function() {
</span><span class="lines">@@ -234,16 +231,35 @@
</span><span class="cx"> this.frame.sidebar().add( 'details', view, options );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- toggleDetails: function( model ) {
</del><ins>+ toggleSelection: function( model ) {
</ins><span class="cx"> var details = this.get('details'),
</span><del>- selection = this.get('selection');
</del><ins>+ selection = this.get('selection'),
+ selected = selection.has( model );
</ins><span class="cx">
</span><del>- if ( selection.has( model ) )
</del><ins>+ 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 ) {
</ins><span class="cx"> this.set( 'details', model );
</span><del>- else if ( selection.length )
</del><ins>+ return;
+ }
+
+ // 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 )
</ins><span class="cx"> this.set( 'details', selection.last() );
</span><span class="cx"> else
</span><span class="cx"> this.unset('details');
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -1072,21 +1088,24 @@
</span><span class="cx"> if ( this.selected() )
</span><span class="cx"> this.select();
</span><span class="cx">
</span><ins>+ // Update the model's details view.
+ this.controller.state().on( 'change:details', this.details, this );
+ this.details();
+
</ins><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ destroy: function() {
+ this.controller.state().off( 'change:details', this.details, this );
+ },
+
</ins><span class="cx"> progress: function() {
</span><span class="cx"> if ( this.$bar && this.$bar.length )
</span><span class="cx"> this.$bar.width( this.model.get('percent') + '%' );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> toggleSelection: function( event ) {
</span><del>- var selection = this.controller.state().get('selection');
-
- if ( ! selection )
- return;
-
- selection[ selection.has( this.model ) ? 'remove' : 'add' ]( this.model );
</del><ins>+ this.controller.state().toggleSelection( this.model );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> selected: function() {
</span><span class="lines">@@ -1119,6 +1138,11 @@
</span><span class="cx"> this.$el.removeClass('selected');
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ details: function() {
+ var details = this.controller.state().get('details');
+ this.$el.toggleClass( 'details', details === this.model );
+ },
+
</ins><span class="cx"> preventDefault: function( event ) {
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>