Changeset 29602

Timestamp:

08/25/2014 06:22:34 PM (10 years ago)

Author:

wonderboymusic

Message:

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 — 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 #23560.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (9 diffs)

trunk/src/wp-includes/js/media-views.js

@@ -2499 +2499 @@
                         // Keep focus inside media modal
                         // after canceling a gallery
-                        new media.view.FocusManager({
-                            el: this.el
-                        }).focus();
+                        this.controller.modal.focusManager.focus();
                     }
                 },
@@ -2690 +2688 @@
                     // Keep focus inside media modal
                     // after jumping to gallery view
-                    new media.view.FocusManager({
-                        el: this.el
-                    }).focus();
+                    this.controller.modal.focusManager.focus();
                 }
             });
@@ -2722 +2718 @@
                     // Keep focus inside media modal
                     // after jumping to playlist view
-                    new media.view.FocusManager({
-                        el: this.el
-                    }).focus();
+                    this.controller.modal.focusManager.focus();
                 }
             });
@@ -2754 +2748 @@
                     // Keep focus inside media modal
                     // after jumping to video playlist view
-                    new media.view.FocusManager({
-                        el: this.el
-                    }).focus();
+                    this.controller.modal.focusManager.focus();
                 }
             });
@@ -3254 +3246 @@
             }
 
-            this.$( '.media-modal-close' ).focus();
+            this.$el.focus();
 
             return this.propagate('open');
@@ -3352 +3344 @@
      */
     media.view.FocusManager = media.View.extend({
+
         events: {
-            keydown: 'recordTab',
-            focusin: 'updateIndex'
-        },
-
-        focus: function() {
-            // Reset focus on first left menu item
-            $('.media-menu-item').first().focus();
+            'keydown': 'constrainTabbing'
+        },
+
+        focus: function() { // Reset focus on first left menu item
+            this.$('.media-menu-item').first().focus();
         },
         /**
          * @param {Object} event
          */
-        recordTab: function( event ) {
+        constrainTabbing: function( event ) {
+            var tabbables;
+
             // Look for the tab key.
             if ( 9 !== event.keyCode ) {
@@ -3370 +3363 @@
             }
 
+            tabbables = this.$( ':tabbable' );
+
             // Keep tab focus within media modal while it's open
-            if ( event.target === this.tabbableLast[0] && !event.shiftKey ) {
-                this.tabbableFirst.focus();
+            if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
+                tabbables.first().focus();
                 return false;
-            } else if ( event.target === this.tabbableFirst[0] && event.shiftKey ) {
-                this.tabbableLast.focus();
+            } else if ( tabbables.first()[0] === event.target && event.shiftKey ) {
+                tabbables.last().focus();
                 return false;
             }
-        },
-        /**
-         * @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' );
         }
+
     });
 
@@ -6166 +6153 @@
             // Keep focus inside media modal
             // after clear link is selected
-            new media.view.FocusManager({
-                el: this.el
-            }).focus();
+            this.controller.modal.focusManager.focus();
         }
     });
@@ -6521 +6506 @@
                 // Keep focus inside media modal
                 // after image is deleted
-                new media.view.FocusManager({
-                    el: this.el
-                }).focus();
+                this.controller.modal.focusManager.focus();
             }
         },