Ticket #23560: 23560.5.diff

wp-includes/js/media-views.js

@@ -1375 +1375 @@
                                                         frame.setState( previous );
                                                 else
                                                         frame.close();
+
+                                                // Keep focus inside media modal
+                                                // after cancelling a gallery
+                                                $('.media-modal-close').focus();
                                         }
                                 },
                                 separateCancel: new media.View({
@@ -1485 +1489 @@
                                         }) );
 
                                         this.controller.setState('gallery-edit');
+
+                                        // Keep focus inside media modal
+                                        // after jumping to gallery view
+                                        $('.media-modal-close').focus();
                                 }
                         });
                 },
@@ -1637 +1645 @@
                         if ( ! this.views.attached || ! this.$el.is(':visible') )
                                 return this;
 
-                        this.$el.hide();
+                        // Hide modal and remove restricted media modal tab focus once it's closed
+                        this.$el.hide().undelegate( 'keydown' );
+
+                        // Put focus back in useful location once modal is closed
+                        $('#wpbody-content').focus();
+
                         this.propagate('close');
 
                         // If the `freeze` option is set, restore the container's scroll position.
@@ -1683 +1696 @@
                                 this.escape();
                                 return;
                         }
-                }
-        });
 
-        // wp.media.view.FocusManager
-        // ----------------------------
-        media.view.FocusManager = media.View.extend({
-                events: {
-                        keydown: 'recordTab',
-                        focusin: 'updateIndex'
-                },
-
-                focus: function() {
-                        if ( _.isUndefined( this.index ) )
+                        if ( $.ui.keyCode.TAB !== event.keyCode )
                                 return;
 
-                        // Update our collection of `$tabbables`.
-                        this.$tabbables = this.$(':tabbable');
+                        // Keep tab focus within media modal while it's open
+                        this.tabbables = $( ':tabbable', this.$el );
+                        this.tabbableFirst = this.tabbables.filter( ':first' );
+                        this.tabbablesLast  = this.tabbables.filter( ':last' );
 
-                        // If tab is saved, focus it.
-                        this.$tabbables.eq( this.index ).focus();
-                },
-
-                recordTab: function( event ) {
-                        // Look for the tab key.
-                        if ( 9 !== event.keyCode )
-                                return;
-
-                        // First try to update the index.
-                        if ( _.isUndefined( this.index ) )
-                                this.updateIndex( event );
-
-                        // If we still don't have an index, bail.
-                        if ( _.isUndefined( this.index ) )
-                                return;
-
-                        var index = this.index + ( event.shiftKey ? -1 : 1 );
-
-                        if ( index >= 0 && index < this.$tabbables.length )
-                                this.index = index;
-                        else
-                                delete this.index;
-                },
-
-                updateIndex: function( event ) {
-                        this.$tabbables = this.$(':tabbable');
-
-                        var index = this.$tabbables.index( event.target );
-
-                        if ( -1 === index )
-                                delete this.index;
-                        else
-                                this.index = index;
+                        if ( event.target === this.tabbablesLast[0] && !event.shiftKey ) {
+                                this.tabbableFirst.focus();
+                                return false;
+                        } else if ( event.target === this.tabbableFirst[0] && event.shiftKey ) {
+                                this.tabbablesLast.focus();
+                                return false;
+                        }
                 }
         });
 
@@ -2493 +2470 @@
                 className: 'attachment',
                 template:  media.template('attachment'),
 
+                attributes: {
+                        tabIndex: 0,
+                        role: 'checkbox'
+                },
+
                 events: {
                         'click .attachment-preview':      'toggleSelectionHandler',
                         'change [data-setting]':          'updateSetting',
@@ -2501 +2483 @@
                         'change [data-setting] textarea': 'updateSetting',
                         'click .close':                   'removeFromLibrary',
                         'click .check':                   'removeFromSelection',
-                        'click a':                        'preventDefault'
+                        'click a':                        'preventDefault',
+                        'keydown':                                                'toggleSelectionHandler'
                 },
 
                 buttons: {},
@@ -2509 +2492 @@
                 initialize: function() {
                         var selection = this.options.selection;
 
+                        this.$el.attr('aria-label', this.model.attributes.title).attr('aria-checked', false);
                         this.model.on( 'change:sizes change:uploading', this.render, this );
                         this.model.on( 'change:title', this._syncTitle, this );
                         this.model.on( 'change:caption', this._syncCaption, this );
@@ -2599 +2583 @@
                 toggleSelectionHandler: function( event ) {
                         var method;
 
+                        // Catch enter and space events
+                        if ( 'keydown' === event.type && $.ui.keyCode.ENTER !== event.keyCode && $.ui.keyCode.SPACE !== event.keyCode )
+                                return;
+
                         if ( event.shiftKey )
                                 method = 'between';
                         else if ( event.ctrlKey || event.metaKey )
@@ -2647 +2635 @@
                                 return;
                         }
 
+                        // Fixes bug that loses focus when selecting a featured image
+                        if ( !method )
+                                method = 'add';
+
                         if ( method !== 'add' )
                                 method = 'reset';
 
@@ -2682 +2674 @@
                         if ( ! selection || ( collection && collection !== selection ) )
                                 return;
 
-                        this.$el.addClass('selected');
+                        this.$el.addClass('selected').attr('aria-checked', true);
                 },
 
                 deselect: function( model, collection ) {
@@ -2694 +2686 @@
                         if ( ! selection || ( collection && collection !== selection ) )
                                 return;
 
-                        this.$el.removeClass('selected');
+                        this.$el.removeClass('selected').attr('aria-checked', false);
                 },
 
                 details: function( model, collection ) {
@@ -2876 +2868 @@
                 tagName:   'ul',
                 className: 'attachments',
 
+                attributes: {
+                        tabIndex: -1
+                },
+
                 cssTemplate: media.template('attachments-css'),
 
                 events: {
@@ -3488 +3484 @@
                 clear: function( event ) {
                         event.preventDefault();
                         this.collection.reset();
+
+                        // Keep focus inside media modal
+                        // after clear link is selected
+                        $('.media-modal-close').focus();
                 }
         });
 
@@ -3731 +3731 @@
                 },
 
                 initialize: function() {
-                        this.focusManager = new media.view.FocusManager({
-                                el: this.el
-                        });
-
                         media.view.Attachment.prototype.initialize.apply( this, arguments );
                 },
 
                 render: function() {
                         media.view.Attachment.prototype.render.apply( this, arguments );
-                        this.focusManager.focus();
                         return this;
                 },
 
@@ -3749 +3744 @@
 
                         if ( confirm( l10n.warnDelete ) )
                                 this.model.destroy();
+
+                        // Keep focus inside media modal
+                        // after image is deleted
+                        $('.media-modal-close').focus();
                 },
 
                 editAttachment: function() {
@@ -3777 +3776 @@
                 },
 
                 initialize: function() {
-                        this.focusManager = new media.view.FocusManager({
-                                el: this.el
-                        });
-
                         this.model.on( 'change:compat', this.render, this );
                 },
 
@@ -3800 +3795 @@
                         this.$el.html( compat.item );
                         this.views.render();
 
-                        this.focusManager.focus();
                         return this;
                 },
 

wp-includes/media-template.php

@@ -15 +15 @@
 function wp_print_media_templates() {
         global $is_IE;
         $class = 'media-modal wp-core-ui';
+        if ( $is_IE )
+                $class .= ' isIE';
         if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false )
                 $class .= ' ie7';
         ?>
@@ -142 +144 @@
                         <# } else if ( 'image' === data.type ) { #>
                                 <div class="thumbnail">
                                         <div class="centered">
-                                                <img src="{{ data.size.url }}" draggable="false" />
+                                                <img src="{{ data.size.url }}" draggable="false" alt="" />
                                         </div>
                                 </div>
                         <# } else { #>
@@ -157 +159 @@
                         <# } #>
 
                         <# if ( data.buttons.check ) { #>
-                                <a class="check" href="#" title="<?php _e('Deselect'); ?>"><div class="media-modal-icon"></div></a>
+                                <a class="check" href="#" title="<?php _e('Deselect'); ?>" tabindex="-1"><div class="media-modal-icon"></div></a>
                         <# } #>
                 </div>
                 <#

wp-includes/css/media-views.css

@@ -441 +441 @@
         border-right: 0;
 }
 
-.media-router > a:active,
-.media-router > a:focus {
+.media-router > a:active {
         outline: none;
 }
 
@@ -635 +634 @@
         user-select:         none;
 }
 
+.attachment:focus {
+        box-shadow: 0px 0px 2pt 2pt #1e8cbe;
+        outline: none;
+}
+
+.isIE .attachment:focus {
+        outline: #1e8cbe solid;
+}
+
 .selected.attachment {
         box-shadow:
                 0 0 0 1px #fff,
                 0 0 0 3px #ccc;
 }
 
+.isIE .selected.attachment {
+        outline: #1e8cbe solid;
+}
+
 .attachment-preview {
         position: relative;
         width: 199px;
@@ -836 +848 @@
         right: 300px;
         bottom: 0;
         overflow: auto;
+        outline: none;
 }
 
 .attachments-browser .instructions {