Ticket #32814: 32814.6.diff

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

@@ -1111 +1111 @@
                                                 control.getMenuControl().debouncedReflowMenuItems();
                                         }
                                 }
+
+                                // After updating, refresh any custom menu widgets containing this menu.
+                                control.getMenuControl()._resetCustomMenuWidgets( control.getMenuControl() );
+
                         });
                 },
 
@@ -1651 +1655 @@
                                                 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 ) );
                         }
                 },
 
@@ -1695 +1698 @@
                                                 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 );
                                 }
                         } );
 
@@ -1707 +1709 @@
                 },
 
                 /**
+                 * Helper function to keep custom menu widgets in sync with menu changes.
+                 *
+                 * Whenever a menu is changed, ensure any custom menu widgets also get refreshed.
+                 */
+                _resetCustomMenuWidgets: function( control ) {
+                        api.control.each( function( widgetControl ) {
+                                if ( ! widgetControl.extended( api.controlConstructor.widget_form ) || 'nav_menu' !== widgetControl.params.widget_id_base ) {
+                                        return;
+                                }
+                                var select, option;
+                                select = widgetControl.container.find( 'select' );
+                                option = select.find( 'option[value=' + control.id.match(/(-?\d+)/)[0] + ']' );
+                                if ( option.length > 0 ) {
+                                        widgetControl.previewer.trigger( 'refresh' );
+                                }
+                        });
+                },
+
+                /**
                  * Allow items in each menu to be re-ordered, and for the order to be previewed.
                  *
                  * Notice that the UI aspects here are handled by wpNavMenu.initSortables()
@@ -1767 +1788 @@
                                                 menuItemControl.setting.set( setting );
                                         });
                                 });
-                        });
 
+                                // After sorting, refresh any custom menu widgets containing this menu.
+                                control._resetCustomMenuWidgets( control );
+
+                        });
                         control.isReordering = false;
 
                         /**
@@ -1835 +1859 @@
                                 }
                                 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();
+
+                         // After deleting, refresh any custom menu widgets containing this menu.
+                        control._resetCustomMenuWidgets( control );
                 },
 
                 // Setup theme location checkboxes.
@@ -2232 +2258 @@
 
                         // 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 +2399 @@
                                         }
                                 } );
 
+                                /**
+                                 * 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.attr( 'selected', true );
+                                        }
+
+                                        // Remove the old option.
+                                        oldMenuOption.remove();
+                                } );
+
                                 if ( oldSection.expanded.get() ) {
                                         // @todo This doesn't seem to be working.
                                         newSection.expand();

src/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 );

src/wp-includes/class-wp-customize-nav-menus.php

@@ -59 +59 @@
                 add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_templates' ) );
                 add_action( 'customize_controls_print_footer_scripts', array( $this, 'available_items_template' ) );
                 add_action( 'customize_preview_init', array( $this, 'customize_preview_init' ) );
+                add_filter( 'wp_get_nav_menu_object', array( $this, 'filter_nav_menu_object' ), 10, 2 );
+
+        }
+
+        /**
+         * Filter the nav menu object to inject `customized` menus.
+         *
+         * @since 4.3.0
+         */
+        public function filter_nav_menu_object( $menu_obj, $menu ) {
+                // Newly-created menus always have a negative ID.
+                if ( is_int( $menu ) && $menu < 0 ) {
+                        // Check to see if there is a customized menu item matching this id.
+                        if ( isset( $_POST['customized'] ) && current_user_can( 'customize' ) ) {
+                                $customized = json_decode( wp_unslash( $_POST['customized'] ), true );
+                                if ( ! empty( $customized ) ) {
+                                        $item_key = 'nav_menu_item[' . $menu . ']';
+                                        if ( isset( $customized[ $item_key ] ) ) {
+                                                $menu_item = $customized[ $item_key ];
+                                        }
+
+                                        if ( isset( $menu_item ) ) {
+
+                                                // Initialize the $menu_obj, required for PHP 5.2 compatibility.
+                                                $menu_obj = new stdClass();
+
+                                                // Build menu object from the customized data.
+                                                $menu_obj->term_id          = $menu;
+                                                $menu_obj->name             = isset( $menu_item['name'] ) ? $menu_item['name'] : '';
+                                                $menu_obj->slug             = sanitize_title( $menu_obj->name );
+                                                $menu_obj->term_group       = 0;
+                                                $menu_obj->term_taxonomy_id = $menu;
+                                                $menu_obj->taxonomy         = 'nav_menu';
+                                                $menu_obj->parent           = isset( $menu_item['parent'] ) ? $menu_item['parent'] : '';
+                                                $menu_obj->count            = isset( $menu_item['count'] ) ? $menu_item['count'] : '';
+                                                $menu_obj->description      = isset( $menu_item['description'] ) ? $menu_item['description'] : '';
+                                                $menu_obj->filter           = isset( $menu_item['filter'] ) ? $menu_item['filter'] : '';
+                                                $menu_obj->ID               = $menu;
+                                        } else {
+                                                $menu_obj = false;
+                                        }
+                                }
+                        }
+                }
+                return $menu_obj;
         }
 
         /**

src/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 ) {