<!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>[22706] trunk/wp-includes: Media: Attachment checkboxes now function as such.</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/22706">22706</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-20 11:10:04 +0000 (Tue, 20 Nov 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Media: Attachment checkboxes now function as such. fixes <a href="http://core.trac.wordpress.org/ticket/22462">#22462</a>, 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>
<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 (22705 => 22706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css        2012-11-20 04:58:34 UTC (rev 22705)
+++ trunk/wp-includes/css/media-views.css        2012-11-20 11:10:04 UTC (rev 22706)
</span><span class="lines">@@ -433,44 +433,19 @@
</span><span class="cx"> .selected.attachment {
</span><span class="cx">         box-shadow:
</span><span class="cx">                 0 0 0 1px #fff,
</span><del>-                0 0 0 4px #777;
</del><ins>+                0 0 0 3px #ccc;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .details.attachment {
</span><span class="cx">         box-shadow:
</span><span class="cx">                 0 0 0 1px #fff,
</span><del>-                0 0 0 4px #1e8cbe;
</del><ins>+                0 0 0 5px #1e8cbe;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-
-.attachment.library.selected:after {
-        content: '\2713';
-        display: block;
-        height: 24px;
-        width: 24px;
-        position: absolute;
-        top: -1px;
-        right: -1px;
-        line-height: 24px;
-        font-size: 18px;
-        text-align: center;
-        color: #fff;
-        text-shadow: 0 1px 0 rgba( 0, 0, 0, 0.5 );
-        background: #777;
-        border: 1px solid #fff;
-        border-width: 0 0 1px 1px;
-        box-shadow: -1px 1px 0 rgba( 0, 0, 0, 0.1 );
-}
-
-.attachment.library.details:after {
-        background: #1e8cbe;
-}
-
</del><span class="cx"> .attachment-preview {
</span><span class="cx">         position: relative;
</span><span class="cx">         width: 199px;
</span><span class="cx">         height: 199px;
</span><del>-        overflow: hidden;
</del><span class="cx">         box-shadow:
</span><span class="cx">                 inset 0 0 15px rgba( 0, 0, 0, 0.1 ),
</span><span class="cx">                 inset 0 0 0 1px rgba( 0, 0, 0, 0.05 );
</span><span class="lines">@@ -485,6 +460,7 @@
</span><span class="cx">         top: 0;
</span><span class="cx">         left: 0;
</span><span class="cx">         margin: 0 auto;
</span><ins>+        overflow: hidden;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* Vertically center the icons. */
</span><span class="lines">@@ -554,7 +530,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .attachment .close {
</span><del>-        display: none;
</del><span class="cx">         position: absolute;
</span><span class="cx">         top: 5px;
</span><span class="cx">         right: 5px;
</span><span class="lines">@@ -571,14 +546,74 @@
</span><span class="cx">         box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 );
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.attachment .close:hover {
</del><ins>+.attachment .button:hover {
</ins><span class="cx">         box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 );
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.attachment .close {
+        display: none;
+}
+
</ins><span class="cx"> .attachment:hover .close {
</span><span class="cx">         display: block;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.attachment .check {
+        display: none;
+        height: 24px;
+        width: 24px;
+        position: absolute;
+        top: -7px;
+        right: -7px;
+        line-height: 24px;
+        font-size: 16px;
+        text-align: center;
+        text-decoration: none;
+        outline: none;
+
+        color: #333;
+        border: 1px solid #fff;
+        border-radius: 3px;
+        text-shadow: 0 1px 0 #fff;
+        box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.4 );
+
+        background: #f1f1f1;
+        background-image: -webkit-gradient(linear, left top, left bottom, from(#f1f1f1), to(#e1e1e1));
+        background-image: -webkit-linear-gradient(top, #f1f1f1, #e1e1e1);
+        background-image:    -moz-linear-gradient(top, #f1f1f1, #e1e1e1);
+        background-image:      -o-linear-gradient(top, #f1f1f1, #e1e1e1);
+        background-image:   linear-gradient(to bottom, #f1f1f1, #e1e1e1);
+}
+
+.attachment .check .dash {
+        font-weight: bold;
+        font-size: 18px;
+        line-height: 22px;
+}
+
+.attachment .check .dash,
+.attachment .check:hover span {
+        display: none;
+}
+
+.attachment.selected .check,
+.attachment .check:hover .dash {
+        display: block;
+}
+
+.attachment.details .check {
+        color: #fff;
+        text-shadow: 0 1px 0 rgba( 0, 0, 0, 0.5 );
+        box-shadow: 0 0 0 1px #1e8cbe;
+
+        background: #1e8cbe;
+        background-image: -webkit-gradient(linear, left top, left bottom, from(#1e8cbe), to(#0074a2));
+        background-image: -webkit-linear-gradient(top, #1e8cbe, #0074a2);
+        background-image:    -moz-linear-gradient(top, #1e8cbe, #0074a2);
+        background-image:      -o-linear-gradient(top, #1e8cbe, #0074a2);
+        background-image:   linear-gradient(to bottom, #1e8cbe, #0074a2);
+}
+
</ins><span class="cx"> .media-frame .describe {
</span><span class="cx">         position: relative;
</span><span class="cx">         display: block;
</span><span class="lines">@@ -858,7 +893,7 @@
</span><span class="cx">         right: 0;
</span><span class="cx">         bottom: 0;
</span><span class="cx">         width: 25px;
</span><del>-        background-image: -webkit-gradient(linear, right top, right top, from( rgba( 255, 255, 255, 1 ) ), to( rgba( 255, 255, 255, 0 ) ));
</del><ins>+        background-image: -webkit-gradient(linear, right top, left top, from( rgba( 255, 255, 255, 1 ) ), to( rgba( 255, 255, 255, 0 ) ));
</ins><span class="cx">         background-image: -webkit-linear-gradient(right, rgba( 255, 255, 255, 1 ) ,  rgba( 255, 255, 255, 0 ) );
</span><span class="cx">         background-image:    -moz-linear-gradient(right, rgba( 255, 255, 255, 1 ) ,  rgba( 255, 255, 255, 0 ) );
</span><span class="cx">         background-image:      -o-linear-gradient(right, rgba( 255, 255, 255, 1 ) ,  rgba( 255, 255, 255, 0 ) );
</span></span></pre></div>
<a id="trunkwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.js (22705 => 22706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js        2012-11-20 04:58:34 UTC (rev 22705)
+++ trunk/wp-includes/js/media-models.js        2012-11-20 11:10:04 UTC (rev 22706)
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx">                         // Refresh the `single` model whenever the selection changes.
</span><span class="cx">                         // Binds `single` instead of using the context argument to ensure
</span><span class="cx">                         // it receives no parameters.
</span><del>-                        this.on( 'add remove reset', _.bind( this.single, this ) );
</del><ins>+                        this.on( 'add remove reset', _.bind( this.single, this, false ) );
</ins><span class="cx">                 },
</span><span class="cx"> 
</span><span class="cx">                 // Override the selection's add method.
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22705 => 22706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js        2012-11-20 04:58:34 UTC (rev 22705)
+++ trunk/wp-includes/js/media-views.js        2012-11-20 11:10:04 UTC (rev 22706)
</span><span class="lines">@@ -2309,12 +2309,13 @@
</span><span class="cx">                 template:  media.template('attachment'),
</span><span class="cx"> 
</span><span class="cx">                 events: {
</span><del>-                        'mousedown .attachment-preview':  'toggleSelection',
</del><ins>+                        'click .attachment-preview':      'toggleSelection',
</ins><span class="cx">                         'change [data-setting]':          'updateSetting',
</span><span class="cx">                         'change [data-setting] input':    'updateSetting',
</span><span class="cx">                         'change [data-setting] select':   'updateSetting',
</span><span class="cx">                         'change [data-setting] textarea': 'updateSetting',
</span><span class="cx">                         'click .close':                   'removeFromLibrary',
</span><ins>+                        'click .check':                   'removeFromSelection',
</ins><span class="cx">                         'click a':                        'preventDefault'
</span><span class="cx">                 },
</span><span class="cx"> 
</span><span class="lines">@@ -2395,7 +2396,7 @@
</span><span class="cx">                                 // it now becomes the single model.
</span><span class="cx">                                 selection[ selection.single() === model ? 'remove' : 'single' ]( model );
</span><span class="cx">                         } else {
</span><del>-                                selection.add( model ).single();
</del><ins>+                                selection.add( model ).single( model );
</ins><span class="cx">                         }
</span><span class="cx">                 },
</span><span class="cx"> 
</span><span class="lines">@@ -2476,6 +2477,17 @@
</span><span class="cx">                         event.stopPropagation();
</span><span class="cx"> 
</span><span class="cx">                         this.collection.remove( this.model );
</span><ins>+                },
+
+                removeFromSelection: function( event ) {
+                        var selection = this.options.selection;
+                        if ( ! selection )
+                                return;
+
+                        // Stop propagation so the model isn't selected.
+                        event.stopPropagation();
+
+                        selection.remove( this.model );
</ins><span class="cx">                 }
</span><span class="cx">         });
</span><span class="cx"> 
</span><span class="lines">@@ -2483,7 +2495,9 @@
</span><span class="cx">          * wp.media.view.Attachment.Library
</span><span class="cx">          */
</span><span class="cx">         media.view.Attachment.Library = media.view.Attachment.extend({
</span><del>-                className: 'attachment library'
</del><ins>+                buttons: {
+                        check: true
+                }
</ins><span class="cx">         });
</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 (22705 => 22706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php        2012-11-20 04:58:34 UTC (rev 22705)
+++ trunk/wp-includes/media.php        2012-11-20 11:10:04 UTC (rev 22706)
</span><span class="lines">@@ -1452,6 +1452,10 @@
</span><span class="cx">                         &lt;# if ( data.buttons.close ) { #&gt;
</span><span class="cx">                                 &lt;a class=&quot;close button&quot; href=&quot;#&quot;&gt;&amp;times;&lt;/a&gt;
</span><span class="cx">                         &lt;# } #&gt;
</span><ins>+
+                        &lt;# if ( data.buttons.check ) { #&gt;
+                                &lt;a class=&quot;check&quot; href=&quot;#&quot;&gt;&lt;span&gt;&amp;#10003;&lt;/span&gt;&lt;span class=&quot;dash&quot;&gt;&amp;ndash;&lt;/span&gt;&lt;/a&gt;
+                        &lt;# } #&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;# if ( data.describe ) { #&gt;
</span><span class="cx">                         &lt;# if ( 'image' === data.type ) { #&gt;
</span></span></pre>
</div>
</div>

</body>
</html>