Ticket #32683: 32683.1.diff

src/wp-admin/js/customize-widgets.js

@@ -2139 +2139 @@
                 return foundControl;
         };
 
+        /* 
+         * Init linking between menu widgets and customizer menus.
+         */
+        $( document ).on( 'widget-added', function( event, widgetContainer ) {
+                if ( 0 < widgetContainer.find( '.nav-menu-widget-form-controls' ).length ) {
+                        var menuField = widgetContainer.find( '.selected-menu' ),
+                            button = widgetContainer.find( '.edit-menu' );
+                        menuField.on( 'change', function() {
+                                if ( 0 < menuField.val() ) {
+                                        button.show();
+                                } else {
+                                        button.hide();
+                                }
+                        });
+                        button.on( 'click', function() {
+                                var section = 'nav_menu[' + menuField.val() + ']';
+                                wp.customize.section( section ).focus();
+                        } );
+                }
+        } );
+
         /**
          * @param {String} widgetId
          * @returns {Object}

src/wp-includes/widgets/class-wp-nav-menu-widget.php

@@ -137 +137 @@
                         </p>
                         <p>
                                 <label for="<?php echo $this->get_field_id( 'nav_menu' ); ?>"><?php _e( 'Select Menu:' ); ?></label>
-                                <select id="<?php echo $this->get_field_id( 'nav_menu' ); ?>" name="<?php echo $this->get_field_name( 'nav_menu' ); ?>">
+                                <select class="selected-menu" id="<?php echo $this->get_field_id( 'nav_menu' ); ?>" name="<?php echo $this->get_field_name( 'nav_menu' ); ?>">
                                         <option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
                                         <?php foreach ( $menus as $menu ) : ?>
                                                 <option value="<?php echo esc_attr( $menu->term_id ); ?>" <?php selected( $nav_menu, $menu->term_id ); ?>>
@@ -145 +145 @@
                                                 </option>
                                         <?php endforeach; ?>
                                 </select>
+                                <?php if ( isset( $GLOBALS['wp_customize'] ) && $GLOBALS['wp_customize'] instanceof WP_Customize_Manager ) : ?>
+                                        <button type="button" class="button edit-menu" style="margin-top: 12px; <?php if ( ! $nav_menu ) { echo 'display: none;'; } ?>"><?php _e( 'Edit Menu' ) ?></button>
+                                <?php endif; ?>
                         </p>
                 </div>
                 <?php