<!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>[22053] trunk/wp-includes: Add quick insert buttons to attachment views in the library and remove buttons to attachment views in the gallery editor.</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/22053">22053</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-09-27 07:45:26 +0000 (Thu, 27 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add quick insert buttons to attachment views in the library and remove buttons to attachment views in the gallery editor. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21809">#21809</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>
<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 (22052 => 22053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-09-27 07:38:16 UTC (rev 22052)
+++ trunk/wp-includes/css/media-views.css 2012-09-27 07:45:26 UTC (rev 22053)
</span><span class="lines">@@ -295,7 +295,37 @@
</span><span class="cx"> box-shadow: inset 0 0 0 1px rgba( 0, 0, 0, 0.4 );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.attachment .insert {
+ display: none;
+ position: absolute;
+ left: 7px;
+ bottom: 7px;
+}
</ins><span class="cx">
</span><ins>+.attachment:hover .insert {
+ display: block;
+}
+
+.attachment .close {
+ /*display: none;*/
+ position: absolute;
+ top: 0;
+ right: 0;
+ height: 26px;
+ width: 26px;
+ font-size: 20px;
+ line-height: 24px;
+ text-align: center;
+ text-decoration: none;
+ color: #464646;
+ background: #fff;
+}
+
+.attachment:hover .close {
+ display: block;
+}
+
+
</ins><span class="cx"> /* Square crop with overflow visible on hover. */
</span><span class="cx"> /*
</span><span class="cx"> .attachment .portrait img {
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22052 => 22053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-09-27 07:38:16 UTC (rev 22052)
+++ trunk/wp-includes/js/media-views.js 2012-09-27 07:45:26 UTC (rev 22053)
</span><span class="lines">@@ -378,6 +378,8 @@
</span><span class="cx"> 'click': 'toggleSelection'
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ buttons: {},
+
</ins><span class="cx"> initialize: function() {
</span><span class="cx"> this.controller = this.options.controller;
</span><span class="cx">
</span><span class="lines">@@ -385,6 +387,9 @@
</span><span class="cx"> this.model.on( 'change:percent', this.progress, this );
</span><span class="cx"> this.model.on( 'add', this.select, this );
</span><span class="cx"> this.model.on( 'remove', this.deselect, this );
</span><ins>+
+ // Prevent default navigation on all links.
+ this.$el.on( 'click', 'a', this.preventDefault );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><span class="lines">@@ -394,7 +399,8 @@
</span><span class="cx"> uploading: attachment.uploading,
</span><span class="cx"> orientation: attachment.orientation || 'landscape',
</span><span class="cx"> type: attachment.type,
</span><del>- subtype: attachment.subtype
</del><ins>+ subtype: attachment.subtype,
+ buttons: this.buttons
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Use the medium image size if possible. If the medium size
</span><span class="lines">@@ -445,6 +451,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.$el.removeClass('selected');
</span><ins>+ },
+
+ preventDefault: function( event ) {
+ event.preventDefault();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -452,14 +462,33 @@
</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>+ className: 'attachment library',
+
+ buttons: {
+ insert: true
+ },
+
+ events: _.defaults({
+ 'click .insert': 'insert'
+ }, media.view.Attachment.prototype.events ),
+
+ insert: function() {
+ this.controller.selection.reset([ this.model ]);
+ this.controller.update();
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * wp.media.view.Attachment.Gallery
</span><span class="cx"> */
</span><span class="cx"> media.view.Attachment.Gallery = media.view.Attachment.extend({
</span><del>- events: {}
</del><ins>+ buttons: {
+ close: true
+ },
+
+ events: {
+ 'click .close': 'toggleSelection'
+ }
</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 (22052 => 22053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-09-27 07:38:16 UTC (rev 22052)
+++ trunk/wp-includes/media.php 2012-09-27 07:45:26 UTC (rev 22053)
</span><span class="lines">@@ -1399,7 +1399,14 @@
</span><span class="cx"> <% if ( uploading ) { %>
</span><span class="cx"> <div class="media-progress-bar"><div></div></div>
</span><span class="cx"> <% } %>
</span><del>- <div class="actions"></div>
</del><ins>+
+ <% if ( buttons.close ) { %>
+ <a class="close" href="#">&times;</a>
+ <% } %>
+
+ <% if ( buttons.insert ) { %>
+ <a class="insert button button-primary button-small" href="#"><?php _e( 'Insert' ); ?></a>
+ <% } %>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="describe"></div>
</span><span class="cx"> </script>
</span></span></pre>
</div>
</div>
</body>
</html>