<!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>[29065] trunk/src/wp-includes: Media Grid: make the edit attachment icon clickable.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/29065">29065</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-10 15:55:21 +0000 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: make the edit attachment icon clickable.
Props ericlewis.
See <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29064 => 29065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-07-10 15:48:54 UTC (rev 29064)
+++ trunk/src/wp-includes/css/media-views.css 2014-07-10 15:55:21 UTC (rev 29065)
</span><span class="lines">@@ -2643,6 +2643,9 @@
</span><span class="cx"> font-weight: 300;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.media-frame.mode-bulk-edit .attachment:hover .inline-toolbar {
+ display: none;
+}
</ins><span class="cx">
</span><span class="cx"> .edit-attachment-frame .edit-media-header .left:before {
</span><span class="cx"> content: '\f340';
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29064 => 29065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-10 15:48:54 UTC (rev 29064)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-10 15:55:21 UTC (rev 29065)
</span><span class="lines">@@ -1812,7 +1812,7 @@
</span><span class="cx"> this.activeModes.on( 'add remove reset', _.bind( this.triggerModeEvents, this ) );
</span><span class="cx">
</span><span class="cx"> _.each( this.options.mode, function( mode ) {
</span><del>- this.activeModes.add( new Backbone.Model( { id: mode } ) );
</del><ins>+ this.activateMode( mode );
</ins><span class="cx"> }, this );
</span><span class="cx">
</span><span class="cx"> // Force the uploader off if the upload limit has been exceeded or
</span><span class="lines">@@ -2005,7 +2005,11 @@
</span><span class="cx"> this.trigger( eventToTrigger );
</span><span class="cx"> },
</span><span class="cx"> activateMode: function( mode ) {
</span><ins>+ if ( this.activeModes.where( { id: mode } ).length ) {
+ return;
+ }
</ins><span class="cx"> this.activeModes.add( [ { id: mode } ] );
</span><ins>+ this.$el.addClass( 'mode-' + mode );
</ins><span class="cx"> this.trigger( mode + ':activate' );
</span><span class="cx"> },
</span><span class="cx"> deactivateMode: function( mode ) {
</span><span class="lines">@@ -2014,6 +2018,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> this.activeModes.remove( this.activeModes.where( { id: mode } ) );
</span><ins>+ this.$el.removeClass( 'mode-' + mode );
</ins><span class="cx"> this.trigger( mode + ':deactivate' );
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -4590,7 +4595,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> events: {
</span><del>- 'click .attachment-preview': 'toggleSelectionHandler',
</del><ins>+ 'click .js--select-attachment': 'toggleSelectionHandler',
</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></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29064 => 29065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-07-10 15:48:54 UTC (rev 29064)
+++ trunk/src/wp-includes/media-template.php 2014-07-10 15:55:21 UTC (rev 29065)
</span><span class="lines">@@ -386,11 +386,11 @@
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-attachment">
</span><span class="cx"> <# if ( _.contains( data.controller.options.mode, 'grid' ) ) { #>
</span><del>- <div class="inline-toolbar">
</del><ins>+ <div class="inline-toolbar js--select-attachment">
</ins><span class="cx"> <div class="dashicons dashicons-edit edit edit-media"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <# } #>
</span><del>- <div class="attachment-preview type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
</del><ins>+ <div class="attachment-preview js--select-attachment type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
</ins><span class="cx"> <# if ( data.uploading ) { #>
</span><span class="cx"> <div class="media-progress-bar"><div></div></div>
</span><span class="cx"> <# } else if ( 'image' === data.type ) { #>
</span></span></pre>
</div>
</div>
</body>
</html>