Changeset 35584

Timestamp:

11/09/2015 03:13:09 AM (11 years ago)

Author:

westonruter

Message:

Customize: Fix focus and autofocus on nav_menu_item controls.

Embed the nav_menu_item control not only when the contained nav_menu section expands, but also if the control was autofocused (via the autofocus[control] query param). Also applies change from [33596] to work-around a broken :focusable selector in jQuery UI.

See #33258.
Fixes #34629.

File:

• trunk/src/wp-admin/js/customize-nav-menus.js (modified) (2 diffs)

trunk/src/wp-admin/js/customize-nav-menus.js

@@ -1013 +1013 @@
                         }
                         section = api.section( sectionId );
-                        if ( section && section.expanded() ) {
+                        if ( ( section && section.expanded() ) || api.settings.autofocus.control === control.id ) {
                                 control.actuallyEmbed();
                         }
@@ -1434 +1434 @@
                  */
                 focus: function() {
-                        this.expandControlSection();
-                        this.expandForm();
-                        this.container.find( '.menu-item-settings :focusable:first' ).focus();
+                        var control = this, focusable;
+                        control.expandControlSection();
+                        control.expandForm();
+                        // Note that we can't use :focusable due to a jQuery UI issue. See: https://github.com/jquery/jquery-ui/pull/1583
+                        focusable = control.container.find( '.menu-item-settings' ).find( 'input, select, textarea, button, object, a[href], [tabindex]' ).filter( ':visible' );
+                        focusable.first().focus();
                 },