<!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>[45524] trunk/src: Accessibility: Improve focus management in the Media Views.</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 { white-space: pre-line; 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/45524">45524</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/45524","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-06-12 21:02:03 +0000 (Wed, 12 Jun 2019)</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'>Accessibility: Improve focus management in the Media Views.
- keeps focus management only where necessary to avoid focus losses
- removes focus management where a specific user workflow was assumed
- makes the "Attachment Details" navigation buttons really disabled when there are no next or previous attachments
- adds inline comments to clarify all the usages of focus()
Fixes <a href="https://core.trac.wordpress.org/ticket/43169">#43169</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjsmediaviewsattachmentdetailsjs">trunk/src/js/media/views/attachment/details.js</a></li>
<li><a href="#trunksrcjsmediaviewsattachmentsbrowserjs">trunk/src/js/media/views/attachments/browser.js</a></li>
<li><a href="#trunksrcjsmediaviewsattachmentsjs">trunk/src/js/media/views/attachments.js</a></li>
<li><a href="#trunksrcjsmediaviewseditimagejs">trunk/src/js/media/views/edit-image.js</a></li>
<li><a href="#trunksrcjsmediaviewsembedurljs">trunk/src/js/media/views/embed/url.js</a></li>
<li><a href="#trunksrcjsmediaviewsfocusmanagerjs">trunk/src/js/media/views/focus-manager.js</a></li>
<li><a href="#trunksrcjsmediaviewsframeeditattachmentsjs">trunk/src/js/media/views/frame/edit-attachments.js</a></li>
<li><a href="#trunksrcjsmediaviewsframepostjs">trunk/src/js/media/views/frame/post.js</a></li>
<li><a href="#trunksrcjsmediaviewsimagedetailsjs">trunk/src/js/media/views/image-details.js</a></li>
<li><a href="#trunksrcjsmediaviewsmediadetailsjs">trunk/src/js/media/views/media-details.js</a></li>
<li><a href="#trunksrcjsmediaviewsmenuitemjs">trunk/src/js/media/views/menu-item.js</a></li>
<li><a href="#trunksrcjsmediaviewsmodaljs">trunk/src/js/media/views/modal.js</a></li>
<li><a href="#trunksrcjsmediaviewsselectionjs">trunk/src/js/media/views/selection.js</a></li>
<li><a href="#trunksrcjsmediaviewssettingsattachmentdisplayjs">trunk/src/js/media/views/settings/attachment-display.js</a></li>
<li><a href="#trunksrcjsmediaviewsuploaderstatusjs">trunk/src/js/media/views/uploader/status.js</a></li>
<li><a href="#trunksrcwpadmincssmediacss">trunk/src/wp-admin/css/media.css</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="trunksrcjsmediaviewsattachmentdetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachment/details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachment/details.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/attachment/details.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var Attachment = wp.media.view.Attachment,
</span><span class="cx" style="display: block; padding: 0 10px"> l10n = wp.media.view.l10n,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px"> Details;
</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">@@ -46,16 +47,67 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets the focusable elements to move focus to.
+ *
+ * @since 5.3.0
+ */
+ getFocusableElements: function() {
+ var editedAttachment = $( 'li[data-id="' + this.model.id + '"]' );
+
+ this.previousAttachment = editedAttachment.prev();
+ this.nextAttachment = editedAttachment.next();
+ },
+
+ /**
+ * Moves focus to the previous or next attachment in the grid.
+ * Fallbacks to the upload button or media frame when there are no attachments.
+ *
+ * @since 5.3.0
+ */
+ moveFocus: function() {
+ if ( this.previousAttachment.length ) {
+ this.previousAttachment.focus();
+ return;
+ }
+
+ if ( this.nextAttachment.length ) {
+ this.nextAttachment.focus();
+ return;
+ }
+
+ // Fallback: move focus to the "Select Files" button in the media modal.
+ if ( this.controller.uploader && this.controller.uploader.$browser ) {
+ this.controller.uploader.$browser.focus();
+ return;
+ }
+
+ // Last fallback.
+ this.moveFocusToLastFallback();
+ },
+
+ /**
+ * Moves focus to the media frame as last fallback.
+ *
+ * @since 5.3.0
+ */
+ moveFocusToLastFallback: function() {
+ // Last fallback: make the frame focusable and move focus to it.
+ $( '.media-frame' )
+ .attr( 'tabindex', '-1' )
+ .focus();
+ },
+
+ /**
</ins><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"> deleteAttachment: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.getFocusableElements();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( window.confirm( l10n.warnDelete ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.model.destroy();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Keep focus inside media modal
- // after image is deleted
- this.controller.modal.focusManager.focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.moveFocus();
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,9 +114,13 @@
</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"> trashAttachment: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var library = this.controller.library;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var library = this.controller.library,
+ self = this;
</ins><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.getFocusableElements();
+
+ // When in the Media Library and the Media trash is enabled.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( wp.media.view.settings.mediaTrash &&
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit-metadata' === this.controller.content.mode() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,9 +127,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.model.set( 'status', 'trash' );
</span><span class="cx" style="display: block; padding: 0 10px"> this.model.save().done( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> library._requery( true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * @todo: We need to move focus back to the previous, next, or first
+ * attachment but the library gets re-queried and refreshed. Thus,
+ * the references to the previous attachments are lost. We need an
+ * alternate method.
+ */
+ self.moveFocusToLastFallback();
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.model.destroy();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.moveFocus();
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,8 +167,8 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When reverse tabbing(shift+tab) out of the right details panel, deliver
- * the focus to the item in the list that was being edited.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When reverse tabbing (shift+tab) out of the right details panel,
+ * move focus to the item that was being edited in the attachments list.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,11 +177,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.controller.trigger( 'attachment:details:shift-tab', event );
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
- this.controller.trigger( 'attachment:keydown:arrow', event );
- return;
- }
</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">
</span></span></pre></div>
<a id="trunksrcjsmediaviewsattachmentsbrowserjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachments/browser.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachments/browser.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/attachments/browser.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +86,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"> editSelection: function( modal ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // When editing a selection, move focus to the "Return to library" button.
</ins><span class="cx" style="display: block; padding: 0 10px"> modal.$( '.media-button-backToLibrary' ).focus();
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcjsmediaviewsattachmentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachments.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/attachments.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.collection.on( 'reset', this.render, this );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.listenTo( this.controller, 'library:selection:add', this.attachmentFocus );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.controller.on( 'library:selection:add', this.attachmentFocus, this );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Throttle the scroll handler and bind this.
</span><span class="cx" style="display: block; padding: 0 10px"> this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,12 +130,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> attachmentFocus: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( 'li:first' ).focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * @todo: when uploading new attachments, this tries to move focus to the
+ * attachmentz grid. Actually, a progress bar gets initially displayed
+ * and then updated when uploading completes, so focus is lost.
+ * Additionally: this view is used for both the attachments list and the
+ * list of selected attachments in the bottom media toolbar. Thus, when
+ * uploading attachments, it is called twice and returns two different `this`.
+ * `this.columns` is truthy within the modal.
+ */
+ if ( this.columns ) {
+ // Move focus to the grid list within the modal.
+ this.$el.focus();
+ }
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Restores focus to the selected item in the collection.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Moves focus back to the first selected attachment in the grid. Used when
+ * tabbing backwards from the attachment details sidebar.
+ * See media.view.AttachmentsBrowser.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span></span></pre></div>
<a id="trunksrcjsmediaviewseditimagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/edit-image.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/edit-image.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/edit-image.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,14 +26,9 @@
</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"> loadEditor: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
- dfd.done( _.bind( this.focus, this ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.editor.open( this.model.get( 'id' ), this.model.get( 'nonces' ).edit, this );
</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">- focus: function() {
- this.$( '.imgedit-submit .button' ).eq( 0 ).focus();
- },
-
</del><span class="cx" style="display: block; padding: 0 10px"> back: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var lastState = this.controller.lastState();
</span><span class="cx" style="display: block; padding: 0 10px"> this.controller.setState( lastState );
</span></span></pre></div>
<a id="trunksrcjsmediaviewsembedurljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/embed/url.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/embed/url.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/embed/url.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,24 +56,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return this;
</span><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">- ready: function() {
- if ( ! wp.media.isTouchDevice ) {
- this.focus();
- }
- },
-
</del><span class="cx" style="display: block; padding: 0 10px"> url: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.model.set( 'url', $.trim( event.target.value ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
-
- /**
- * If the input is visible, focus and select its contents.
- */
- focus: function() {
- var $input = this.$input;
- if ( $input.is(':visible') ) {
- $input.focus()[0].select();
- }
</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">
</span></span></pre></div>
<a id="trunksrcjsmediaviewsfocusmanagerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/focus-manager.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/focus-manager.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/focus-manager.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,11 +15,20 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Moves focus to the first visible menu item in the modal.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets all the tabbable elements.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ getTabbables: function() {
+ // Skip the file input added by Plupload.
+ return this.$( ':tabbable' ).not( '.moxie-shim input[type="file"]' );
+ },
+
+ /**
+ * Moves focus to the modal dialog.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> focus: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.media-menu-item' ).filter( ':visible' ).first().focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$( '.media-modal' ).focus();
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,8 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><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">- // Skip the file input added by Plupload.
- tabbables = this.$( ':tabbable' ).not( '.moxie-shim input[type="file"]' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ tabbables = this.getTabbables();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Keep tab focus within media modal while it's open
</span><span class="cx" style="display: block; padding: 0 10px"> if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
</span></span></pre></div>
<a id="trunksrcjsmediaviewsframeeditattachmentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/frame/edit-attachments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/frame/edit-attachments.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/frame/edit-attachments.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,8 +91,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Completely destroy the modal DOM element when closing it.
</span><span class="cx" style="display: block; padding: 0 10px"> this.modal.on( 'close', _.bind( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( 'body' ).off( 'keydown.media-modal' ); /* remove the keydown event */
- // Restore the original focus item if possible
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove the keydown event.
+ $( 'body' ).off( 'keydown.media-modal' );
+ // Move focus back to the original item in the grid if possible.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'li.attachment[data-id="' + this.model.get( 'id' ) +'"]' ).focus();
</span><span class="cx" style="display: block; padding: 0 10px"> this.resetRoute();
</span><span class="cx" style="display: block; padding: 0 10px"> }, this ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,8 +174,8 @@
</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"> toggleNav: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$('.left').toggleClass( 'disabled', ! this.hasPrevious() );
- this.$('.right').toggleClass( 'disabled', ! this.hasNext() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$( '.left' ).prop( 'disabled', ! this.hasPrevious() );
+ this.$( '.right' ).prop( 'disabled', ! this.hasNext() );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,8 +205,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! this.hasPrevious() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'refresh', this.library.at( this.getCurrentIndex() - 1 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.left' ).focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the Previous button. When there are no more items, to the Next button.
+ this.focusNavButton( this.hasPrevious() ? '.left' : '.right' );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,10 +218,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! this.hasNext() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'refresh', this.library.at( this.getCurrentIndex() + 1 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$( '.right' ).focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the Next button. When there are no more items, to the Previous button.
+ this.focusNavButton( this.hasNext() ? '.right' : '.left' );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Set focus to the navigation buttons depending on the browsing direction.
+ *
+ * @since 5.3.0
+ *
+ * @param {string} which A CSS selector to target the button to focus.
+ */
+ focusNavButton: function( which ) {
+ $( which ).focus();
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> getCurrentIndex: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> return this.library.indexOf( this.model );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre></div>
<a id="trunksrcjsmediaviewsframepostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/frame/post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/frame/post.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/frame/post.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,8 +290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> frame.close();
</span><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">- // Keep focus inside media modal
- // after canceling a gallery
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal after canceling a Gallery.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.controller.modal.focusManager.focus();
</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">@@ -317,6 +316,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> frame.close();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Move focus to the modal after canceling an Audio Playlist.
+ this.controller.modal.focusManager.focus();
</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"> separateCancel: new wp.media.View({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,6 +343,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> frame.close();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Move focus to the modal after canceling a Video Playlist.
+ this.controller.modal.focusManager.focus();
</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"> separateCancel: new wp.media.View({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -358,10 +363,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }).render();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.content.set( view );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( ! wp.media.isTouchDevice ) {
- view.url.focus();
- }
</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"> editSelectionContent: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -483,10 +484,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> multiple: true
</span><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">- this.controller.setState('gallery-edit');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Jump to Edit Gallery view.
+ this.controller.setState( 'gallery-edit' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Keep focus inside media modal
- // after jumping to gallery view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal after jumping to Edit Gallery view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.controller.modal.focusManager.focus();
</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">@@ -513,10 +514,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> multiple: true
</span><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">- this.controller.setState('playlist-edit');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Jump to Edit Audio Playlist view.
+ this.controller.setState( 'playlist-edit' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Keep focus inside media modal
- // after jumping to playlist view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal after jumping to Edit Audio Playlist view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.controller.modal.focusManager.focus();
</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">@@ -543,10 +544,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> multiple: true
</span><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">- this.controller.setState('video-playlist-edit');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Jump to Edit Video Playlist view.
+ this.controller.setState( 'video-playlist-edit' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Keep focus inside media modal
- // after jumping to video playlist view
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal after jumping to Edit Video Playlist view.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.controller.modal.focusManager.focus();
</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">@@ -616,6 +617,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> edit.get('library').add( state.get('selection').models );
</span><span class="cx" style="display: block; padding: 0 10px"> state.trigger('reset');
</span><span class="cx" style="display: block; padding: 0 10px"> controller.setState('gallery-edit');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal when jumping back from Add to Gallery to Edit Gallery view.
+ this.controller.modal.focusManager.focus();
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,6 +676,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> edit.get('library').add( state.get('selection').models );
</span><span class="cx" style="display: block; padding: 0 10px"> state.trigger('reset');
</span><span class="cx" style="display: block; padding: 0 10px"> controller.setState('playlist-edit');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal when jumping back from Add to Audio Playlist to Edit Audio Playlist view.
+ this.controller.modal.focusManager.focus();
</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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,6 +732,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> edit.get('library').add( state.get('selection').models );
</span><span class="cx" style="display: block; padding: 0 10px"> state.trigger('reset');
</span><span class="cx" style="display: block; padding: 0 10px"> controller.setState('video-playlist-edit');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal when jumping back from Add to Video Playlist to Edit Video Playlist view.
+ this.controller.modal.focusManager.focus();
</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"> }
</span></span></pre></div>
<a id="trunksrcjsmediaviewsimagedetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/image-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/image-details.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/image-details.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,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"> postRender: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setTimeout( _.bind( this.resetFocus, this ), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setTimeout( _.bind( this.scrollToTop, this ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.toggleLinkSettings();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( window.getUserSetting( 'advImgDetails' ) === 'show' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.toggleAdvanced( true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,8 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'post-render' );
</span><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">- resetFocus: function() {
- this.$( '.link-to-custom' ).blur();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scrollToTop: function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.$( '.embed-media-settings' ).scrollTop( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcjsmediaviewsmediadetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/media-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/media-details.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/media-details.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> AttachmentDisplay.prototype.render.apply( this, arguments );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( _.bind( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.resetFocus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.scrollToTop();
</ins><span class="cx" style="display: block; padding: 0 10px"> }, this ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.settings = _.defaults( {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return this.setMedia();
</span><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">- resetFocus: function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ scrollToTop: function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.$( '.embed-media-settings' ).scrollTop( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },/** @lends wp.media.view.MediaDetails */{
</span></span></pre></div>
<a id="trunksrcjsmediaviewsmenuitemjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/menu-item.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/menu-item.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/menu-item.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var $ = jQuery,
- MenuItem;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MenuItem;
</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"> * wp.media.view.MenuItem
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,12 +36,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.click();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // When selecting a tab along the left side,
- // focus should be transferred into the main panel
- if ( ! wp.media.isTouchDevice ) {
- $('.media-frame-content input').first().focus();
- }
</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"> click: function() {
</span></span></pre></div>
<a id="trunksrcjsmediaviewsmodaljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/modal.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/modal.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/modal.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,10 +135,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Hide modal and remove restricted media modal tab focus once it's closed
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.hide().undelegate( 'keydown' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Put focus back in useful location once modal is closed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus back in useful location once modal is closed.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( null !== this.clickedOpenerEl ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus back to the element that opened the modal.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.clickedOpenerEl.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fallback to the admin page main element.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#wpbody-content' )
</span><span class="cx" style="display: block; padding: 0 10px"> .attr( 'tabindex', '-1' )
</span><span class="cx" style="display: block; padding: 0 10px"> .focus();
</span></span></pre></div>
<a id="trunksrcjsmediaviewsselectionjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/selection.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/selection.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/selection.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,8 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> this.collection.reset();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Keep focus inside media modal
- // after clear link is selected
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.controller.modal.focusManager.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcjsmediaviewssettingsattachmentdisplayjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/settings/attachment-display.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/settings/attachment-display.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/settings/attachment-display.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,11 +83,6 @@
</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"> $input.closest( '.setting' ).removeClass( 'hidden' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // If the input is visible, focus and select its contents.
- if ( ! wp.media.isTouchDevice && $input.is(':visible') ) {
- $input.focus()[0].select();
- }
</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">
</span></span></pre></div>
<a id="trunksrcjsmediaviewsuploaderstatusjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/uploader/status.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/uploader/status.js 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/js/media/views/uploader/status.js 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.invoke( errors, 'remove' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> wp.Uploader.errors.reset();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Keep focus within the modal after the dismiss button gets removed from the DOM.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move focus to the modal after the dismiss button gets removed from the DOM.
</ins><span class="cx" style="display: block; padding: 0 10px"> this.controller.modal.focusManager.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpadmincssmediacss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/media.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/media.css 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/wp-admin/css/media.css 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,14 +682,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> content: "\f345";
</span><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">-.edit-attachment-frame .edit-media-header .left.disabled,
-.edit-attachment-frame .edit-media-header .right.disabled,
-.edit-attachment-frame .edit-media-header .left.disabled:hover,
-.edit-attachment-frame .edit-media-header .right.disabled:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.edit-attachment-frame .edit-media-header [disabled],
+.edit-attachment-frame .edit-media-header [disabled]:hover {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #ccc;
</span><span class="cx" style="display: block; padding: 0 10px"> background: inherit;
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: default;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- pointer-events: none;
</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"> .edit-attachment-frame .media-frame-content,
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></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/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2019-06-12 19:35:20 UTC (rev 45523)
+++ trunk/src/wp-includes/media-template.php 2019-06-12 21:02:03 UTC (rev 45524)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,8 +323,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php // Template for the Attachment Details layout in the media browser. ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-edit-attachment-frame">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="edit-media-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button class="left dashicons <# if ( ! data.hasPrevious ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e( 'Previous' ); ?></span></button>
- <button class="right dashicons <# if ( ! data.hasNext ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e( 'Next' ); ?></span></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button class="left dashicons"<# if ( ! data.hasPrevious ) { #> disabled<# } #>><span class="screen-reader-text"><?php _e( 'Edit previous media item' ); ?></span></button>
+ <button class="right dashicons"<# if ( ! data.hasNext ) { #> disabled<# } #>><span class="screen-reader-text"><?php _e( 'Edit next media item' ); ?></span></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close dialog' ); ?></span></span></button>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="media-frame-title"></div>
</span></span></pre>
</div>
</div>
</body>
</html>