Changeset 39622 for trunk

Timestamp:

12/20/2016 10:04:22 PM (8 years ago)

Author:

westonruter

Message:

Customize: Fix visible edit shortcuts for wp_nav_menu() instances using the menu arg (such as in the Custom Menu widget) instead of the theme_location arg.

Also fix logic for focus-control-for-setting handler to focus on the first control (lowest priority value) associated with a given setting instead of the last control encountered when iterating over all controls, as this ensures the first control in a nav_menu section is focused rather than the last one.

Props westonruter, sirbrillig.
See #27403.
Fixes #39101.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (1 diff)
• wp-includes/js/customize-selective-refresh.js (modified) (1 diff)

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

@@ -5366 +5366 @@
         // Focus on the control that is associated with the given setting.
         api.previewer.bind( 'focus-control-for-setting', function( settingId ) {
-            var matchedControl;
+            var matchedControls = [];
             api.control.each( function( control ) {
                 var settingIds = _.pluck( control.settings, 'id' );
                 if ( -1 !== _.indexOf( settingIds, settingId ) ) {
-                    matchedControl = control;
+                    matchedControls.push( control );
                 }
             } );
 
-            if ( matchedControl ) {
-                matchedControl.focus();
+            // Focus on the matched control with the lowest priority (appearing higher).
+            if ( matchedControls.length ) {
+                matchedControls.sort( function( a, b ) {
+                    return a.priority() - b.priority();
+                } );
+                matchedControls[0].focus();
             }
         } );

trunk/src/wp-includes/js/customize-selective-refresh.js

@@ -313 +313 @@
          */
         showControl: function() {
-            var partial = this, settingId = partial.params.primarySetting, menuSlug;
+            var partial = this, settingId = partial.params.primarySetting;
             if ( ! settingId ) {
                 settingId = _.first( partial.settings() );
             }
             if ( partial.getType() === 'nav_menu' ) {
-                menuSlug = partial.params.navMenuArgs.theme_location;
-                if ( menuSlug ) {
-                    settingId = 'nav_menu_locations[' + menuSlug + ']';
+                if ( partial.params.navMenuArgs.theme_location ) {
+                    settingId = 'nav_menu_locations[' + partial.params.navMenuArgs.theme_location + ']';
+                } else if ( partial.params.navMenuArgs.menu )   {
+                    settingId = 'nav_menu[' + String( partial.params.navMenuArgs.menu ) + ']';
                 }
             }