Ticket #32576: 32576.menu-customizer-core-misc.diff

src/wp-content/themes/twentyfifteen/js/functions.js

@@ -9 +9 @@
         var $body, $window, $sidebar, adminbarOffset, top = false,
             bottom = false, windowWidth, windowHeight, lastWindowPos = 0,
             topOffset = 0, bodyHeight, sidebarHeight, resizeTimer,
-                secondary, button;
-
-        // Add dropdown toggle that display child menu items.
-        $( '.main-navigation .menu-item-has-children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false">' + screenReaderText.expand + '</button>' );
-
-        // Toggle buttons and submenu items with active children menu items.
-        $( '.main-navigation .current-menu-ancestor > button' ).addClass( 'toggle-on' );
-        $( '.main-navigation .current-menu-ancestor > .sub-menu' ).addClass( 'toggled-on' );
-
-        $( '.dropdown-toggle' ).click( function( e ) {
-                var _this = $( this );
-                e.preventDefault();
-                _this.toggleClass( 'toggle-on' );
-                _this.next( '.children, .sub-menu' ).toggleClass( 'toggled-on' );
-                _this.attr( 'aria-expanded', _this.attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' );
-                _this.html( _this.html() === screenReaderText.expand ? screenReaderText.collapse : screenReaderText.expand );
-        } );
+            secondary, button;
+
+
+        function initMainNavigation() {
+                // Add dropdown toggle that display child menu items.
+                $( '.main-navigation .menu-item-has-children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false">' + screenReaderText.expand + '</button>' );
+
+                // Toggle buttons and submenu items with active children menu items.
+                $( '.main-navigation .current-menu-ancestor > button' ).addClass( 'toggle-on' );
+                $( '.main-navigation .current-menu-ancestor > .sub-menu' ).addClass( 'toggled-on' );
+
+                $( '.dropdown-toggle' ).click( function( e ) {
+                        var _this = $( this );
+                        e.preventDefault();
+                        _this.toggleClass( 'toggle-on' );
+                        _this.next( '.children, .sub-menu' ).toggleClass( 'toggled-on' );
+                        _this.attr( 'aria-expanded', _this.attr( 'aria-expanded' ) === 'false' ? 'true' : 'false' );
+                        _this.html( _this.html() === screenReaderText.expand ? screenReaderText.collapse : screenReaderText.expand );
+                } );
+        }
+        initMainNavigation();
+        $( document ).on( 'customize-preview-menu-refreshed', initMainNavigation );
 
         secondary = $( '#secondary' );
         button = $( '.site-branding' ).find( '.secondary-toggle' );

src/wp-includes/nav-menu-template.php

@@ -230 +230 @@
         'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s</ul>',
         'depth' => 0, 'walker' => '', 'theme_location' => '' );
 
+        // Prevent a fallback_cb in Customizer Preview to assist with has_nav_menu() and partial refresh.
+        if ( is_customize_preview() ) {
+                $defaults['fallback_cb'] = '';
+        }
+
         $args = wp_parse_args( $args, $defaults );
         /**
          * Filter the arguments used to display a navigation menu.