<!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>[29602] trunk/src/wp-includes/js/media-views.js: Media: cleanup recent changes to `media.view.FocusManager`.</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/29602">29602</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-08-25 18:22:34 +0000 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: cleanup recent changes to `media.view.FocusManager`.
* Adjusts the focus method to target the menu for the current modal
* Refactor the FocusManager so that the method names and the functionality matches more closely with how it currently works. The changes in 4.0 to the FocusManager change the purpose of the focus manager entirely ?\226?\128?\148 instead of being a way to save and restore focus state, the new FocusManager is about constraining keyboard navigation via the tab key to inside the modal.
Props gcorne.
See <a href="http://core.trac.wordpress.org/ticket/23560">#23560</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29601 => 29602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-25 18:06:06 UTC (rev 29601)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-25 18:22:34 UTC (rev 29602)
</span><span class="lines">@@ -2498,9 +2498,7 @@
</span><span class="cx">
</span><span class="cx"> // Keep focus inside media modal
</span><span class="cx"> // after canceling a gallery
</span><del>- new media.view.FocusManager({
- el: this.el
- }).focus();
</del><ins>+ this.controller.modal.focusManager.focus();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> separateCancel: new media.View({
</span><span class="lines">@@ -2689,9 +2687,7 @@
</span><span class="cx">
</span><span class="cx"> // Keep focus inside media modal
</span><span class="cx"> // after jumping to gallery view
</span><del>- new media.view.FocusManager({
- el: this.el
- }).focus();
</del><ins>+ this.controller.modal.focusManager.focus();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="lines">@@ -2721,9 +2717,7 @@
</span><span class="cx">
</span><span class="cx"> // Keep focus inside media modal
</span><span class="cx"> // after jumping to playlist view
</span><del>- new media.view.FocusManager({
- el: this.el
- }).focus();
</del><ins>+ this.controller.modal.focusManager.focus();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="lines">@@ -2753,9 +2747,7 @@
</span><span class="cx">
</span><span class="cx"> // Keep focus inside media modal
</span><span class="cx"> // after jumping to video playlist view
</span><del>- new media.view.FocusManager({
- el: this.el
- }).focus();
</del><ins>+ this.controller.modal.focusManager.focus();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="lines">@@ -3253,7 +3245,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this.$( '.media-modal-close' ).focus();
</del><ins>+ this.$el.focus();
</ins><span class="cx">
</span><span class="cx"> return this.propagate('open');
</span><span class="cx"> },
</span><span class="lines">@@ -3351,42 +3343,37 @@
</span><span class="cx"> * @augments Backbone.View
</span><span class="cx"> */
</span><span class="cx"> media.view.FocusManager = media.View.extend({
</span><ins>+
</ins><span class="cx"> events: {
</span><del>- keydown: 'recordTab',
- focusin: 'updateIndex'
</del><ins>+ 'keydown': 'constrainTabbing'
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- focus: function() {
- // Reset focus on first left menu item
- $('.media-menu-item').first().focus();
</del><ins>+ focus: function() { // Reset focus on first left menu item
+ this.$('.media-menu-item').first().focus();
</ins><span class="cx"> },
</span><span class="cx"> /**
</span><span class="cx"> * @param {Object} event
</span><span class="cx"> */
</span><del>- recordTab: function( event ) {
</del><ins>+ constrainTabbing: function( event ) {
+ var tabbables;
+
</ins><span class="cx"> // Look for the tab key.
</span><span class="cx"> if ( 9 !== event.keyCode ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ tabbables = this.$( ':tabbable' );
+
</ins><span class="cx"> // Keep tab focus within media modal while it's open
</span><del>- if ( event.target === this.tabbableLast[0] && !event.shiftKey ) {
- this.tabbableFirst.focus();
</del><ins>+ if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
+ tabbables.first().focus();
</ins><span class="cx"> return false;
</span><del>- } else if ( event.target === this.tabbableFirst[0] && event.shiftKey ) {
- this.tabbableLast.focus();
</del><ins>+ } else if ( tabbables.first()[0] === event.target && event.shiftKey ) {
+ tabbables.last().focus();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- },
- /**
- * @param {Object} event
- */
- updateIndex: function() {
- // Resets tabbable elements
- this.tabbables = $( ':tabbable', this.$el );
- this.tabbableFirst = this.tabbables.filter( ':first' );
- this.tabbableLast = this.tabbables.filter( ':last' );
</del><span class="cx"> }
</span><ins>+
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -6165,9 +6152,7 @@
</span><span class="cx">
</span><span class="cx"> // Keep focus inside media modal
</span><span class="cx"> // after clear link is selected
</span><del>- new media.view.FocusManager({
- el: this.el
- }).focus();
</del><ins>+ this.controller.modal.focusManager.focus();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -6520,9 +6505,7 @@
</span><span class="cx"> this.model.destroy();
</span><span class="cx"> // Keep focus inside media modal
</span><span class="cx"> // after image is deleted
</span><del>- new media.view.FocusManager({
- el: this.el
- }).focus();
</del><ins>+ this.controller.modal.focusManager.focus();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>