Changeset 33283

Timestamp:

07/15/2015 08:04:41 PM (11 years ago)

Author:

westonruter

Message:

Customizer: Defer updating nav menu item tabIndex attributes until pane is reflowed.

Introduces pane-contents-reflowed Customizer event.

Props valendesigns, westonruter.
Fixes #32943.

Location:

trunk/src/wp-admin/js

Files:

• customize-controls.js (modified) (1 diff)
• customize-nav-menus.js (modified) (3 diffs)

trunk/src/wp-admin/js/customize-controls.js

@@ -3235 +3235 @@
                 activeElement.focus();
             }
+            api.trigger( 'pane-contents-reflowed' );
         }, api );
         api.bind( 'ready', api.reflowPaneContents );

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

@@ -674 +674 @@
 
             section.refreshAssignedLocations();
+
+            api.bind( 'pane-contents-reflowed', function() {
+                // Skip menus that have been removed.
+                if ( ! section.container.parent().length ) {
+                    return;
+                }
+                section.container.find( '.menu-item .menu-item-reorder-nav button' ).prop( 'tabIndex', 0 );
+                section.container.find( '.menu-item.move-up-disabled .menus-move-up' ).prop( 'tabIndex', -1 );
+                section.container.find( '.menu-item.move-down-disabled .menus-move-down' ).prop( 'tabIndex', -1 );
+                section.container.find( '.menu-item.move-left-disabled .menus-move-left' ).prop( 'tabIndex', -1 );
+                section.container.find( '.menu-item.move-right-disabled .menus-move-right' ).prop( 'tabIndex', -1 );
+            } );
         },
 
@@ -2032 +2044 @@
         reflowMenuItems: function() {
             var menuControl = this,
-                menuSection = api.section( 'nav_menu[' + String( menuControl.params.menu_id ) + ']' ),
                 menuItemControls = menuControl.getMenuItemControls(),
                 reflowRecursively;
@@ -2098 +2109 @@
                 currentAbsolutePosition: 0
             } );
-
-            menuSection.container.find( '.menu-item .menu-item-reorder-nav button' ).prop( 'tabIndex', 0 );
-            menuSection.container.find( '.menu-item.move-up-disabled .menus-move-up' ).prop( 'tabIndex', -1 );
-            menuSection.container.find( '.menu-item.move-down-disabled .menus-move-down' ).prop( 'tabIndex', -1 );
-            menuSection.container.find( '.menu-item.move-left-disabled .menus-move-left' ).prop( 'tabIndex', -1 );
-            menuSection.container.find( '.menu-item.move-right-disabled .menus-move-right' ).prop( 'tabIndex', -1 );
 
             menuControl.container.find( '.reorder-toggle' ).toggle( menuItemControls.length > 1 );