Ticket #32814: 32814.8.diff

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

@@ -1647 +1647 @@
                                                 return;
                                         }
                                         var select = widgetControl.container.find( 'select' );
-                                        if ( select.find( 'option[value=' + String( menuId ) + ']' ).length === 0 ) {
+                                        if ( 0 === select.find( 'option[value=' + String( menuId ) + ']' ).length ) {
                                                 select.append( new Option( name, menuId ) );
                                         }
                                 } );
-                                $( '#available-widgets-list .widget-inside:has(input.id_base[value=nav_menu]) select:first' ).append( new Option( name, menuId ) );
+                                // Add to any already present widgets.
+                                //$( '#available-widgets-list .widget-inside:has(input.id_base[value=nav_menu]) select:first' ).append( new Option( name, menuId ) );
+
+                                // Add the menu to the widget template.
+                                // @todo Not this only works of the widget area already has a
+                                // select element, add coverage for no menus case.
+                                var template = $( '#available-widgets-list .widget-inside:has( input.id_base[ value=nav_menu ] ) select:first' );
+
+                                // Avoid duplicate insertion.
+                                if ( 0 === template.find( 'option[value=' + String( menuId ) + ']' ).length ) {
+                                                template.append( new Option( name, menuId ) );
+                                }
                         }
                 },
 
@@ -1695 +1706 @@
                                                 var select = widgetControl.container.find( 'select' );
                                                 select.find( 'option[value=' + String( menuId ) + ']' ).text( name );
                                         });
-                                        $( '#available-widgets-list .widget-inside:has(input.id_base[value=nav_menu]) select:first option[value=' + String( menuId ) + ']' ).text( name );
                                 }
                         } );
 
@@ -1767 +1777 @@
                                                 menuItemControl.setting.set( setting );
                                         });
                                 });
+
                         });
-
                         control.isReordering = false;
 
                         /**
@@ -1835 +1845 @@
                                 }
                                 select.find( 'option[value=' + String( menuId ) + ']' ).remove();
                         });
-                        $( '#available-widgets-list .widget-inside:has(input.id_base[value=nav_menu]) select:first option[value=' + String( menuId ) + ']' ).remove();
+
                 },
 
                 // Setup theme location checkboxes.
@@ -2232 +2242 @@
 
                         // Focus on the new menu section.
                         api.section( customizeId ).focus(); // @todo should we focus on the new menu's control and open the add-items panel? Thinking user flow...
+
+                        // Fix an issue with extra space at top immediately after creating new menu.
+                        $( '#menu-to-edit' ).css( 'margin-top', 0 );
                 }
         });
 
@@ -2370 +2383 @@
                                         }
                                 } );
 
+                                /**
+                                 * Update the saved menu in any custom menu widgets.
+                                 * If the previous_term_id item is selected, reselect the
+                                 * item with the updated term_id.
+                                 */
+                                api.control.each( function( setting ) {
+                                        // Only act on nav_menu widgets.
+                                        if ( ! setting.extended( api.controlConstructor.widget_form ) ||
+                                                'nav_menu' !== setting.params.widget_id_base ) {
+                                                return;
+                                        }
+                                        var select, oldMenuOption, oldMenuSelected, newMenuOption;
+                                        select          = setting.container.find( 'select' );
+                                        oldMenuOption   = select.find( 'option[value=' + String( update.previous_term_id ) + ']' );
+                                        oldMenuSelected = select.find( 'option[value=' + String( update.previous_term_id ) + ']:selected' );
+                                        newMenuOption   = select.find( 'option[value=' + String( update.term_id ) + ']' );
+
+                                        // Adjust menu options matching the old ID, setting them to the new ID.
+                                        if ( oldMenuSelected.length !== 0 && newMenuOption !== 0 ) {
+                                                // Remove the old option.
+                                                oldMenuOption.remove();
+                                                // Select the new option.
+                                                newMenuOption.attr( 'selected', true ).trigger( 'change' );
+                                        }
+
+
+                                } );
+
                                 if ( oldSection.expanded.get() ) {
                                         // @todo This doesn't seem to be working.
                                         newSection.expand();

wp-admin/js/customize-widgets.js

@@ -1041 +1041 @@
                         params.wp_customize = 'on';
                         params.nonce = api.Widgets.data.nonce;
                         params.theme = api.settings.theme.stylesheet;
+                        params.customized = wp.customize.previewer.query().customized;
 
                         data = $.param( params );
                         $inputs = this._getInputs( $widgetContent );

wp-includes/nav-menu.php

@@ -12 +12 @@
  *
  * @since 3.0.0
  *
- * @param string $menu Menu ID, slug, or name.
+ * @param string $menu Menu ID, slug, or name - or the menu object.
  * @return object|false False if $menu param isn't supplied or term does not exist, menu object if successful.
  */
 function wp_get_nav_menu_object( $menu ) {
         $menu_obj = false;
-        if ( $menu ) {
+
+        if ( is_object( $menu ) ) {
+                $menu_obj = $menu;
+        }
+
+        if ( $menu && ! $menu_obj ) {
                 $menu_obj = get_term( $menu, 'nav_menu' );
 
                 if ( ! $menu_obj ) {