<!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>[23031] trunk/wp-includes: Media: Hide "Edit" link in the selection view when it doesn't make sense</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/23031">23031</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-12-04 18:23:47 +0000 (Tue, 04 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Hide "Edit" link in the selection view when it doesn't make sense
Props koopersmith, ocean90, nacin
fixes <a href="http://core.trac.wordpress.org/ticket/22713">#22713</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescssmediaviewsrtlcss">trunk/wp-includes/css/media-views-rtl.css</a></li>
<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="trunkwpincludescssmediaviewsrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views-rtl.css (23030 => 23031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views-rtl.css 2012-12-04 18:13:59 UTC (rev 23030)
+++ trunk/wp-includes/css/media-views-rtl.css 2012-12-04 18:23:47 UTC (rev 23031)
</span><span class="lines">@@ -232,6 +232,8 @@
</span><span class="cx"> .media-selection .selection-info a:last-child {
</span><span class="cx"> border-right: 1px;
</span><span class="cx"> border-left: 0;
</span><ins>+ margin-left: 0;
+ margin-right: -8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-selection:after {
</span></span></pre></div>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (23030 => 23031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-12-04 18:13:59 UTC (rev 23030)
+++ trunk/wp-includes/css/media-views.css 2012-12-04 18:23:47 UTC (rev 23031)
</span><span class="lines">@@ -1116,10 +1116,15 @@
</span><span class="cx"> vertical-align: top;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.media-selection.empty {
</del><ins>+.media-selection.empty,
+.media-selection.editing {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.media-selection.one .edit-selection {
+ display: none;
+}
+
</ins><span class="cx"> .media-selection .count {
</span><span class="cx"> display: block;
</span><span class="cx"> padding-top: 12px;
</span><span class="lines">@@ -1147,6 +1152,7 @@
</span><span class="cx">
</span><span class="cx"> .media-selection .selection-info a:last-child {
</span><span class="cx"> border-right: 0;
</span><ins>+ margin-right: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-selection .selection-info .clear-selection {
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (23030 => 23031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-12-04 18:13:59 UTC (rev 23030)
+++ trunk/wp-includes/js/media-views.js 2012-12-04 18:23:47 UTC (rev 23031)
</span><span class="lines">@@ -1567,7 +1567,7 @@
</span><span class="cx"> toolbar: 'main-gallery',
</span><span class="cx"> filterable: 'uploaded',
</span><span class="cx"> multiple: 'add',
</span><del>- editable: true,
</del><ins>+ editable: false,
</ins><span class="cx">
</span><span class="cx"> library: media.query( _.defaults({
</span><span class="cx"> type: 'image'
</span><span class="lines">@@ -3638,6 +3638,7 @@
</span><span class="cx">
</span><span class="cx"> this.views.set( '.selection-view', this.attachments );
</span><span class="cx"> this.collection.on( 'add remove reset', this.refresh, this );
</span><ins>+ this.controller.on( 'content:activate', this.refresh, this );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> ready: function() {
</span><span class="lines">@@ -3649,9 +3650,15 @@
</span><span class="cx"> if ( ! this.$el.children().length )
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ var collection = this.collection,
+ editing = 'edit-selection' === this.controller.content.mode();
+
</ins><span class="cx"> // If nothing is selected, display nothing.
</span><del>- this.$el.toggleClass( 'empty', ! this.collection.length );
- this.$('.count').text( this.collection.length + ' ' + l10n.selected );
</del><ins>+ this.$el.toggleClass( 'empty', ! collection.length );
+ this.$el.toggleClass( 'one', 1 === collection.length );
+ this.$el.toggleClass( 'editing', editing );
+
+ this.$('.count').text( collection.length + ' ' + l10n.selected );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> edit: function( event ) {
</span></span></pre>
</div>
</div>
</body>
</html>