WordPress 4.7.1-scripts

[autoinstallsdev/wordpress.git] / wp-includes / js / customize-selective-refresh.js

diff --git a/wp-includes/js/customize-selective-refresh.js b/wp-includes/js/customize-selective-refresh.js
index f6dfa0b9d803494f85dda064cbfc47f1253cb93f..d3b81db6d7fa868d9090d863ca11971bdc3036cf 100644 (file)
--- a/wp-includes/js/customize-selective-refresh.js
+++ b/wp-includes/js/customize-selective-refresh.js
@@ -121,12 +121,12 @@ wp.customize.selectiveRefresh = ( function( $, api ) {
                                return;
                        }
                        $shortcut = partial.createEditShortcut();
-                       partial.addEditShortcutToPlacement( placement, $shortcut );
                        $shortcut.on( 'click', function( event ) {
                                event.preventDefault();
                                event.stopPropagation();
                                partial.showControl();
                        } );
+                       partial.addEditShortcutToPlacement( placement, $shortcut );
                },
 
                /**
@@ -312,14 +312,15 @@ wp.customize.selectiveRefresh = ( function( $, api ) {
                 * @since 4.5.0
                 */
                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 ) + ']';
                                }
                        }
                        api.preview.send( 'focus-control-for-setting', settingId );