Changeset 36908

Timestamp:

03/09/2016 09:40:27 PM (9 years ago)

Author:

westonruter

Message:

Customize: Fix persistence of toggles for displayed nav menu item properties.

• Eliminates need to click more than one checkbox to have preferences saved.
• Adds debouncing to saving user-selected menu item properties.
• Also removes discrepancies between available nav menu item properties on admin page vs Customizer.

Fixes #35273.
Props afercia, westonruter.

Location:

trunk/src

Files:

• wp-admin/includes/nav-menu.php (modified) (1 diff)
• wp-admin/js/customize-nav-menus.js (modified) (3 diffs)
• wp-includes/customize/class-wp-customize-nav-menus-panel.php (modified) (2 diffs)

trunk/src/wp-admin/includes/nav-menu.php

@@ -938 +938 @@
  * @since 3.0.0
  *
- * @return string|WP_Error $output The menu formatted to edit or error object on failure.
+ * @return array Columns.
  */
 function wp_nav_menu_manage_columns() {
     return array(
-        '_title' => __('Show advanced menu properties'),
-        'cb' => '<input type="checkbox" />',
-        'title-attribute' => __('Title Attribute'),
-        'link-target' => __('Link Target'),
-        'css-classes' => __('CSS Classes'),
-        'xfn' => __('Link Relationship (XFN)'),
-        'description' => __('Description'),
+        '_title'      => __( 'Show advanced menu properties' ),
+        'cb'          => '<input type="checkbox" />',
+        'link-target' => __( 'Link Target' ),
+        'attr-title'  => __( 'Title Attribute' ),
+        'css-classes' => __( 'CSS Classes' ),
+        'xfn'         => __( 'Link Relationship (XFN)' ),
+        'description' => __( 'Description' ),
     );
 }

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

@@ -219 +219 @@
                     .removeClass( 'is-visible' );
             }
-            
+
             this.searchTerm = event.target.value;
             this.pages.search = 1;
@@ -615 +615 @@
         },
 
-        saveManageColumnsState: function() {
-            var hidden = this.hidden();
-            $.post( wp.ajax.settings.url, {
-                action: 'hidden-columns',
-                hidden: hidden,
+        saveManageColumnsState: _.debounce( function() {
+            var panel = this;
+            if ( panel._updateHiddenColumnsRequest ) {
+                panel._updateHiddenColumnsRequest.abort();
+            }
+
+            panel._updateHiddenColumnsRequest = wp.ajax.post( 'hidden-columns', {
+                hidden: panel.hidden(),
                 screenoptionnonce: $( '#screenoptionnonce' ).val(),
                 page: 'nav-menus'
-            });
-        },
+            } );
+            panel._updateHiddenColumnsRequest.always( function() {
+                panel._updateHiddenColumnsRequest = null;
+            } );
+        }, 2000 ),
 
         checked: function( column ) {
@@ -634 +640 @@
 
         hidden: function() {
-            this.hidden = function() {
-                return $( '.hide-column-tog' ).not( ':checked' ).map( function() {
-                    var id = this.id;
-                    return id.substring( id, id.length - 5 );
-                }).get().join( ',' );
-            };
+            return $( '.hide-column-tog' ).not( ':checked' ).map( function() {
+                var id = this.id;
+                return id.substring( 0, id.length - 5 );
+            }).get().join( ',' );
         }
     } );

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

@@ -35 +35 @@
      */
     public function render_screen_options() {
-        // Essentially adds the screen options.
-        add_filter( 'manage_nav-menus_columns', array( $this, 'wp_nav_menu_manage_columns' ) );
+        // Adds the screen options.
+        require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+        add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
 
         // Display screen options.
@@ -49 +50 @@
      *
      * @since 4.3.0
-     * @access public
-     *
-     * @return array The advanced menu properties.
+     * @deprecated 4.5.0 Deprecated in favor of wp_nav_menu_manage_columns().
      */
     public function wp_nav_menu_manage_columns() {
-        return array(
-            '_title'      => __( 'Show advanced menu properties' ),
-            'cb'          => '<input type="checkbox" />',
-            'link-target' => __( 'Link Target' ),
-            'attr-title'  => __( 'Title Attribute' ),
-            'css-classes' => __( 'CSS Classes' ),
-            'xfn'         => __( 'Link Relationship (XFN)' ),
-            'description' => __( 'Description' ),
-        );
+        _deprecated_function( __METHOD__, '4.5.0', 'wp_nav_menu_manage_columns' );
+        require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+        return wp_nav_menu_manage_columns();
     }