<!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>[29560] trunk/src: Media Grid/Modal Keyboard navigation improvements:</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/29560">29560</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-08-21 02:34:23 +0000 (Thu, 21 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid/Modal Keyboard navigation improvements:
* Add focus to arrows on Next/Previous in the grid's modal on left/right keypress, and add the necessary CSS for `:focus`
* When in a disabled input in the grid modal, allow the left/right keys to work
* Make the image editor return a `$.Deferred` so that there isn't a race condition with UI loading.
* Assign focus when the edit image mode is rendered so that the modal can be closed on Esc press
Props wonderboymusic, adamsilverstein (for the initial patch).
See <a href="http://core.trac.wordpress.org/ticket/23560">#23560</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsimageeditjs">trunk/src/wp-admin/js/image-edit.js</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</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="trunksrcwpadminjsimageeditjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/image-edit.js (29559 => 29560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/image-edit.js 2014-08-20 21:33:56 UTC (rev 29559)
+++ trunk/src/wp-admin/js/image-edit.js 2014-08-21 02:34:23 UTC (rev 29560)
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> open : function( postid, nonce, view ) {
</span><span class="cx"> this._view = view;
</span><span class="cx">
</span><del>- var data, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid),
</del><ins>+ var dfd, data, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid),
</ins><span class="cx"> btn = $('#imgedit-open-btn-' + postid), spin = btn.siblings('.spinner');
</span><span class="cx">
</span><span class="cx"> btn.prop('disabled', true);
</span><span class="lines">@@ -315,13 +315,20 @@
</span><span class="cx"> 'do': 'open'
</span><span class="cx"> };
</span><span class="cx">
</span><del>- elem.load(ajaxurl, data, function() {
</del><ins>+ dfd = $.ajax({
+ url: ajaxurl,
+ type: 'post',
+ data: data
+ }).done(function( html ) {
+ elem.html( html );
</ins><span class="cx"> head.fadeOut('fast', function(){
</span><span class="cx"> elem.fadeIn('fast');
</span><span class="cx"> btn.removeAttr('disabled');
</span><span class="cx"> spin.hide();
</span><span class="cx"> });
</span><span class="cx"> });
</span><ins>+
+ return dfd;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> imgLoaded : function(postid) {
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29559 => 29560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-08-20 21:33:56 UTC (rev 29559)
+++ trunk/src/wp-includes/css/media-views.css 2014-08-21 02:34:23 UTC (rev 29560)
</span><span class="lines">@@ -2717,6 +2717,12 @@
</span><span class="cx"> *
</span><span class="cx"> * This should be OOCSS'd so both use a shared selector.
</span><span class="cx"> */
</span><ins>+.edit-attachment-frame {
+ display: block;
+ height: 100%;
+ width: 100%;
+}
+
</ins><span class="cx"> .edit-attachment-frame .edit-media-header {
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="lines">@@ -2773,8 +2779,10 @@
</span><span class="cx"> font-weight: 300;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.edit-attachment-frame .edit-media-header .left:hover,
</ins><span class="cx"> .edit-attachment-frame .edit-media-header .right:hover,
</span><del>-.edit-attachment-frame .edit-media-header .left:hover {
</del><ins>+.edit-attachment-frame .edit-media-header .left:focus,
+.edit-attachment-frame .edit-media-header .right:focus {
</ins><span class="cx"> color: #2ea2cc;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29559 => 29560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-08-20 21:33:56 UTC (rev 29559)
+++ trunk/src/wp-includes/js/media-grid.js 2014-08-21 02:34:23 UTC (rev 29560)
</span><span class="lines">@@ -365,8 +365,9 @@
</span><span class="cx"> regions: [ 'title', 'content' ],
</span><span class="cx">
</span><span class="cx"> events: {
</span><del>- 'click .left': 'previousMediaItem',
- 'click .right': 'nextMediaItem'
</del><ins>+ 'click .left': 'previousMediaItem',
+ 'click .right': 'nextMediaItem',
+ 'keydown': 'keyEvent'
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><span class="lines">@@ -522,11 +523,12 @@
</span><span class="cx"> */
</span><span class="cx"> previousMediaItem: function() {
</span><span class="cx"> if ( ! this.hasPrevious() ) {
</span><ins>+ this.$( '.left' ).blur();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> this.model = this.library.at( this.getCurrentIndex() - 1 );
</span><del>-
</del><span class="cx"> this.rerender();
</span><ins>+ this.$( '.left' ).focus();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -534,11 +536,12 @@
</span><span class="cx"> */
</span><span class="cx"> nextMediaItem: function() {
</span><span class="cx"> if ( ! this.hasNext() ) {
</span><ins>+ this.$( '.right' ).blur();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> this.model = this.library.at( this.getCurrentIndex() + 1 );
</span><del>-
</del><span class="cx"> this.rerender();
</span><ins>+ this.$( '.right' ).focus();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getCurrentIndex: function() {
</span><span class="lines">@@ -556,18 +559,10 @@
</span><span class="cx"> * Respond to the keyboard events: right arrow, left arrow, escape.
</span><span class="cx"> */
</span><span class="cx"> keyEvent: function( event ) {
</span><del>- var $target = $( event.target );
-
- //Don't go left/right if we are in a textarea or input field
- if ( $target.is( 'input' ) || $target.is( 'textarea' ) ) {
- return event;
</del><ins>+ if ( 'INPUT' === event.target.tagName && ! ( event.target.readOnly || event.target.disabled ) ) {
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Escape key, while in the Edit Image mode
- if ( 27 === event.keyCode ) {
- this.modal.close();
- }
-
</del><span class="cx"> // The right arrow key
</span><span class="cx"> if ( 39 === event.keyCode ) {
</span><span class="cx"> this.nextMediaItem();
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29559 => 29560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-20 21:33:56 UTC (rev 29559)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-21 02:34:23 UTC (rev 29560)
</span><span class="lines">@@ -3256,7 +3256,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $el.find( '.media-modal-close' ).focus();
</del><ins>+ this.$( '.media-modal-close' ).focus();
</ins><span class="cx">
</span><span class="cx"> return this.propagate('open');
</span><span class="cx"> },
</span><span class="lines">@@ -4809,7 +4809,7 @@
</span><span class="cx">
</span><span class="cx"> // Catch arrow events
</span><span class="cx"> if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
</span><del>- this.arrowEvent(event);
</del><ins>+ this.controller.trigger( 'attachment:keydown:arrow', event );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4850,13 +4850,6 @@
</span><span class="cx"> event.stopPropagation();
</span><span class="cx"> },
</span><span class="cx"> /**
</span><del>- * @param {Object} event
- */
- arrowEvent: function( event ) {
- this.controller.trigger( 'attachment:keydown:arrow', event );
- return false;
- },
- /**
</del><span class="cx"> * @param {Object} options
</span><span class="cx"> */
</span><span class="cx"> toggleSelection: function( options ) {
</span><span class="lines">@@ -6579,6 +6572,11 @@
</span><span class="cx"> this.$( ':tabbable' ).eq( 0 ).blur();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+ if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+ this.controller.trigger( 'attachment:keydown:arrow', event );
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -7157,9 +7155,14 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> loadEditor: function() {
</span><del>- this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
</del><ins>+ var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
+ dfd.done( _.bind( this.focus, this ) );
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ focus: function() {
+ this.$( '.imgedit-submit .button' ).eq( 0 ).focus();
+ },
+
</ins><span class="cx"> back: function() {
</span><span class="cx"> var lastState = this.controller.lastState();
</span><span class="cx"> this.controller.setState( lastState );
</span></span></pre>
</div>
</div>
</body>
</html>