<!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>[30374] trunk/src/wp-includes: Improve keyboard control of Edit Selection mode in the media manager.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30374">30374</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30374","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-18 03:33:11 +0000 (Tue, 18 Nov 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Improve keyboard control of Edit Selection mode in the media manager.
See <a href="https://core.trac.wordpress.org/ticket/29326">#29326</a>
Props adamsilverstein</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/media-views.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/media-views.css 2014-11-17 18:26:34 UTC (rev 30373)
+++ trunk/src/wp-includes/css/media-views.css 2014-11-18 03:33:11 UTC (rev 30374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,7 +925,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .attachment .close {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- display: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: block;
</ins><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> top: 5px;
</span><span class="cx" style="display: block; padding: 0 10px"> right: 5px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,15 +944,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 3px;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 );
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ transition-duration: none;
+ transition-property: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.attachment .close:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.attachment a.close:hover,
+.attachment a.close:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 );
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background-position: -36px 4px;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.attachment:hover .close {
- display: block;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .attachment .check {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media-views.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media-views.js 2014-11-17 18:26:34 UTC (rev 30373)
+++ trunk/src/wp-includes/js/media-views.js 2014-11-18 03:33:11 UTC (rev 30374)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3016,6 +3016,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Browse our library of attachments.
</span><span class="cx" style="display: block; padding: 0 10px"> this.content.set( view );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Trigger the controller to set focus
+ view.controller.trigger( 'edit:selection', this );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editImageContent: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5096,6 +5099,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .close': 'removeFromLibrary',
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .check': 'checkClickHandler',
</span><span class="cx" style="display: block; padding: 0 10px"> 'click a': 'preventDefault',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keydown .close': 'removeFromLibrary',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'keydown': 'toggleSelectionHandler'
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5537,6 +5541,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {Object} event
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> removeFromLibrary: function( event ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Catch enter and space events
+ if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Stop propagation so the model isn't selected.
</span><span class="cx" style="display: block; padding: 0 10px"> event.stopPropagation();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6236,7 +6245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.controller.on( 'edit:selection', this.editSelection );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.createToolbar();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.options.sidebar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.createSidebar();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6255,6 +6264,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.collection.on( 'add remove reset', this.updateContent, this );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ editSelection: function( modal ) {
+ modal.$el.find( '.media-button-backToLibrary' ).focus();
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>