Ticket #38952: 38952.0.diff

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

@@ -301 +301 @@
         text-decoration: none !important;
 }
 
-#accordion-panel-nav_menus .field-link-target,
-#accordion-panel-nav_menus .field-title-attribute,
-#accordion-panel-nav_menus .field-css-classes,
-#accordion-panel-nav_menus .field-xfn,
-#accordion-panel-nav_menus .field-description {
+.control-section-nav_menu .field-link-target,
+.control-section-nav_menu .field-title-attribute,
+.control-section-nav_menu .field-css-classes,
+.control-section-nav_menu .field-xfn,
+.control-section-nav_menu .field-description {
         display: none;
 }
 
-#accordion-panel-nav_menus.field-link-target-active .field-link-target,
-#accordion-panel-nav_menus.field-title-attribute-active .field-title-attribute,
-#accordion-panel-nav_menus.field-css-classes-active .field-css-classes,
-#accordion-panel-nav_menus.field-xfn-active .field-xfn,
-#accordion-panel-nav_menus.field-description-active .field-description {
+.control-section-nav_menu.field-link-target-active .field-link-target,
+.control-section-nav_menu.field-title-attribute-active .field-title-attribute,
+.control-section-nav_menu.field-css-classes-active .field-css-classes,
+.control-section-nav_menu.field-xfn-active .field-xfn,
+.control-section-nav_menu.field-description-active .field-description {
         display: block;
 }
 

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

@@ -800 +800 @@
 
                                 panel.saveManageColumnsState();
                         });
-                        this.container.find( '.hide-column-tog' ).each( function() {
-                        var $t = $( this ), column = $t.val();
-                                if ( $t.prop( 'checked' ) ) {
-                                        panel.checked( column );
-                                } else {
-                                        panel.unchecked( column );
-                                }
-                        });
                 },
 
                 saveManageColumnsState: _.debounce( function() {
@@ -827 +819 @@
                 }, 2000 ),
 
                 checked: function( column ) {
-                        this.container.addClass( 'field-' + column + '-active' );
+                        _.each( this.sections(), function( section ) {
+                                section.container.addClass( 'field-' + column + '-active' );
+                        } );
                 },
 
                 unchecked: function( column ) {
-                        this.container.removeClass( 'field-' + column + '-active' );
+                        _.each( this.sections(), function( section ) {
+                                section.container.removeClass( 'field-' + column + '-active' );
+                        } );
                 },
 
                 hidden: function() {
@@ -923 +919 @@
                                 section.container.find( '.menu-item.move-left-disabled .menus-move-left' ).attr({ 'tabindex': '-1', 'aria-hidden': 'true' });
                                 section.container.find( '.menu-item.move-right-disabled .menus-move-right' ).attr({ 'tabindex': '-1', 'aria-hidden': 'true' });
                         } );
+
+                        // Set the initial classes for active fields.
+                        api.panel( 'nav_menus' ).container.find( '.hide-column-tog' ).each( function() {
+                                var $toggle = $( this ), column = $toggle.val();
+                                section.container.toggleClass( 'field-' + column + '-active', $toggle.prop( 'checked' ) );
+                        });
                 },
 
                 populateControls: function() {