Changeset 32806

Timestamp:

06/16/2015 10:07:08 PM (9 years ago)

Author:

ocean90

Message:

Add menu management to the Customizer.

This brings in the Menu Customizer plugin: ​https://wordpress.org/plugins/menu-customizer/.

props celloexpressions, westonruter, valendesigns, voldemortensen, ocean90, adamsilverstein, kucrut, jorbin, designsimply, afercia, davidakennedy, obenland.
see #32576.

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/wp-admin/css/customize-nav-menus.css (added)
• src/wp-admin/js/customize-nav-menus.js (added)
• src/wp-includes/class-wp-customize-control.php (modified) (1 diff)
• src/wp-includes/class-wp-customize-manager.php (modified) (3 diffs)
• src/wp-includes/class-wp-customize-nav-menus.php (added)
• src/wp-includes/class-wp-customize-section.php (modified) (1 diff)
• src/wp-includes/class-wp-customize-setting.php (modified) (1 diff)
• src/wp-includes/css/customize-preview.css (added)
• src/wp-includes/js/customize-preview-nav-menus.js (added)
• src/wp-includes/script-loader.php (modified) (4 diffs)
• tests/phpunit/tests/customize/nav-menu-item-setting.php (added)
• tests/phpunit/tests/customize/nav-menu-setting.php (added)
• tests/phpunit/tests/customize/nav-menus.php (added)

trunk/Gruntfile.js

@@ -142 +142 @@
         cssmin: {
             options: {
-                'wp-admin': ['wp-admin', 'color-picker', 'customize-controls', 'customize-widgets', 'ie', 'install', 'login', 'press-this', 'deprecated-*']
+                'wp-admin': ['wp-admin', 'color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'ie', 'install', 'login', 'press-this', 'deprecated-*']
             },
             core: {

trunk/src/wp-includes/class-wp-customize-control.php

@@ -1403 +1403 @@
     }
 }
+
+/**
+ * Customize Nav Menus Panel Class
+ *
+ * Needed to add screen options.
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel {
+
+    /**
+     * Control type.
+     *
+     * @since 4.3.0
+     *
+     * @access public
+     * @var string
+     */
+    public $type = 'nav_menus';
+
+    /**
+     * Render screen options for Menus.
+     *
+     * @since 4.3.0
+     */
+    public function render_screen_options() {
+        // Essentially adds the screen options.
+        add_filter( 'manage_nav-menus_columns', array( $this, 'wp_nav_menu_manage_columns' ) );
+
+        // Display screen options.
+        $screen = WP_Screen::get( 'nav-menus.php' );
+        $screen->render_screen_options();
+    }
+
+    /**
+     * Returns the advanced options for the nav menus page.
+     *
+     * Link title attribute added as it's a relatively advanced concept for new users.
+     *
+     * @since 4.3.0
+     *
+     * @return array The advanced menu properties.
+     */
+    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' ),
+        );
+    }
+
+    /**
+     * An Underscore (JS) template for this panel's content (but not its container).
+     *
+     * Class variables for this panel class are available in the `data` JS object;
+     * export custom variables by overriding {@see WP_Customize_Panel::json()}.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Panel::print_template()
+     *
+     * @since 4.3.0
+     */
+    protected function content_template() {
+        ?>
+        <li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
+            <button type="button" class="customize-panel-back" tabindex="-1">
+                <span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+            </button>
+            <div class="accordion-section-title">
+                <span class="preview-notice">
+                    <?php
+                        /* translators: %s is the site/panel title in the Customizer */
+                        printf( __( 'You are customizing %s' ), '<strong class="panel-title">{{ data.title }}</strong>' );
+                    ?>
+                </span>
+                <button type="button" class="customize-screen-options-toggle" aria-expanded="false">
+                    <span class="screen-reader-text"><?php _e( 'Menu Options' ); ?></span>
+                </button>
+                <button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false">
+                    <span class="screen-reader-text"><?php _e( 'Help' ); ?></span>
+                </button>
+            </div>
+            <# if ( data.description ) { #>
+            <div class="description customize-panel-description">{{{ data.description }}}</div>
+            <# } #>
+            <?php $this->render_screen_options(); ?>
+        </li>
+        <?php
+    }
+}
+
+/**
+ * Customize Nav Menu Control Class
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
+
+    /**
+     * Control type.
+     *
+     * @since 4.3.0
+     *
+     * @access public
+     * @var string
+     */
+    public $type = 'nav_menu';
+
+    /**
+     * The nav menu setting.
+     *
+     * @since 4.3.0
+     *
+     * @var WP_Customize_Nav_Menu_Setting
+     */
+    public $setting;
+
+    /**
+     * Don't render the control's content - it uses a JS template instead.
+     *
+     * @since 4.3.0
+     */
+    public function render_content() {}
+
+    /**
+     * JS/Underscore template for the control UI.
+     *
+     * @since 4.3.0
+     */
+    public function content_template() {
+        ?>
+        <button type="button" class="button-secondary add-new-menu-item">
+            <?php _e( 'Add Items' ); ?>
+        </button>
+        <button type="button" class="not-a-button reorder-toggle">
+            <span class="reorder"><?php _ex( 'Reorder', 'Reorder menu items in Customizer' ); ?></span>
+            <span class="reorder-done"><?php _ex( 'Done', 'Cancel reordering menu items in Customizer' ); ?></span>
+        </button>
+        <span class="add-menu-item-loading spinner"></span>
+        <span class="menu-delete-item">
+            <button type="button" class="not-a-button menu-delete">
+                <?php _e( 'Delete menu' ); ?> <span class="screen-reader-text">{{ data.menu_name }}</span>
+            </button>
+        </span>
+        <?php if ( current_theme_supports( 'menus' ) ) : ?>
+        <ul class="menu-settings">
+            <li class="customize-control">
+                <span class="customize-control-title"><?php _e( 'Menu locations' ); ?></span>
+            </li>
+
+            <?php foreach ( get_registered_nav_menus() as $location => $description ) : ?>
+            <li class="customize-control customize-control-checkbox assigned-menu-location">
+                <label>
+                    <input type="checkbox" data-menu-id="{{ data.menu_id }}" data-location-id="<?php echo esc_attr( $location ); ?>" class="menu-location" /> <?php echo $description; ?>
+                    <span class="theme-location-set"><?php printf( _x( '(Current: %s)', 'Current menu location' ), '<span class="current-menu-location-name-' . esc_attr( $location ) . '"></span>' ); ?></span>
+                </label>
+            </li>
+            <?php endforeach; ?>
+
+        </ul>
+        <?php endif; ?>
+        <p>
+            <label>
+                <input type="checkbox" class="auto_add">
+                <?php _e( 'Automatically add new top-level pages to this menu.' ) ?>
+            </label>
+        </p>
+        <?php
+    }
+
+    /**
+     * Return params for this control.
+     *
+     * @since 4.3.0
+     *
+     * @return array
+     */
+    function json() {
+        $exported            = parent::json();
+        $exported['menu_id'] = $this->setting->term_id;
+
+        return $exported;
+    }
+}
+
+/**
+ * Customize control to represent the name field for a given menu.
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
+
+    /**
+     * Control type.
+     *
+     * @since 4.3.0
+     *
+     * @access public
+     * @var string
+     */
+    public $type = 'nav_menu_item';
+
+    /**
+     * The nav menu item setting.
+     *
+     * @since 4.3.0
+     *
+     * @var WP_Customize_Nav_Menu_Item_Setting
+     */
+    public $setting;
+
+    /**
+     * Constructor.
+     *
+     * @since 4.3.0
+     *
+     * @uses WP_Customize_Control::__construct()
+     *
+     * @param WP_Customize_Manager $manager An instance of the WP_Customize_Manager class.
+     * @param string               $id      The control ID.
+     * @param array                $args    Optional. Overrides class property defaults.
+     */
+    public function __construct( $manager, $id, $args = array() ) {
+        parent::__construct( $manager, $id, $args );
+    }
+
+    /**
+     * Don't render the control's content - it's rendered with a JS template.
+     *
+     * @since 4.3.0
+     */
+    public function render_content() {}
+
+    /**
+     * JS/Underscore template for the control UI.
+     *
+     * @since 4.3.0
+     */
+    public function content_template() {
+        ?>
+        <dl class="menu-item-bar">
+            <dt class="menu-item-handle">
+                <span class="item-type">{{ data.item_type_label }}</span>
+                <span class="item-title">
+                    <span class="spinner"></span>
+                    <span class="menu-item-title">{{ data.title }}</span>
+                </span>
+                <span class="item-controls">
+                    <button type="button" class="not-a-button item-edit"><span class="screen-reader-text"><?php _e( 'Edit Menu Item' ); ?></span></button>
+                    <button type="button" class="not-a-button item-delete submitdelete deletion"><span class="screen-reader-text"><?php _e( 'Remove Menu Item' ); ?></span></button>
+                </span>
+            </dt>
+        </dl>
+
+        <div class="menu-item-settings" id="menu-item-settings-{{ data.menu_item_id }}">
+            <# if ( 'custom' === data.item_type ) { #>
+            <p class="field-url description description-thin">
+                <label for="edit-menu-item-url-{{ data.menu_item_id }}">
+                    <?php _e( 'URL' ); ?><br />
+                    <input class="widefat code edit-menu-item-url" type="text" id="edit-menu-item-url-{{ data.menu_item_id }}" name="menu-item-url" />
+                </label>
+            </p>
+        <# } #>
+            <p class="description description-thin">
+                <label for="edit-menu-item-title-{{ data.menu_item_id }}">
+                    <?php _e( 'Navigation Label' ); ?><br />
+                    <input type="text" id="edit-menu-item-title-{{ data.menu_item_id }}" class="widefat edit-menu-item-title" name="menu-item-title" />
+                </label>
+            </p>
+            <p class="field-link-target description description-thin">
+                <label for="edit-menu-item-target-{{ data.menu_item_id }}">
+                    <input type="checkbox" id="edit-menu-item-target-{{ data.menu_item_id }}" class="edit-menu-item-target" value="_blank" name="menu-item-target" />
+                    <?php _e( 'Open link in a new tab' ); ?>
+                </label>
+            </p>
+            <p class="field-attr-title description description-thin">
+                <label for="edit-menu-item-attr-title-{{ data.menu_item_id }}">
+                    <?php _e( 'Title Attribute' ); ?><br />
+                    <input type="text" id="edit-menu-item-attr-title-{{ data.menu_item_id }}" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title" />
+                </label>
+            </p>
+            <p class="field-css-classes description description-thin">
+                <label for="edit-menu-item-classes-{{ data.menu_item_id }}">
+                    <?php _e( 'CSS Classes' ); ?><br />
+                    <input type="text" id="edit-menu-item-classes-{{ data.menu_item_id }}" class="widefat code edit-menu-item-classes" name="menu-item-classes" />
+                </label>
+            </p>
+            <p class="field-xfn description description-thin">
+                <label for="edit-menu-item-xfn-{{ data.menu_item_id }}">
+                    <?php _e( 'Link Relationship (XFN)' ); ?><br />
+                    <input type="text" id="edit-menu-item-xfn-{{ data.menu_item_id }}" class="widefat code edit-menu-item-xfn" name="menu-item-xfn" />
+                </label>
+            </p>
+            <p class="field-description description description-thin">
+                <label for="edit-menu-item-description-{{ data.menu_item_id }}">
+                    <?php _e( 'Description' ); ?><br />
+                    <textarea id="edit-menu-item-description-{{ data.menu_item_id }}" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description">{{ data.description }}</textarea>
+                    <span class="description"><?php _e( 'The description will be displayed in the menu if the current theme supports it.' ); ?></span>
+                </label>
+            </p>
+
+            <div class="menu-item-actions description-thin submitbox">
+                <# if ( 'custom' != data.item_type && '' != data.original_title ) { #>
+                <p class="link-to-original">
+                    <?php printf( __( 'Original: %s' ), '<a class="original-link" href="{{ data.url }}">{{{ data.original_title }}}</a>' ); ?>
+                </p>
+                <# } #>
+
+                <button type="button" class="not-a-button item-delete submitdelete deletion"><?php _e( 'Remove' ); ?></button>
+                <span class="spinner"></span>
+            </div>
+            <input type="hidden" name="menu-item-db-id[{{ data.menu_item_id }}]" class="menu-item-data-db-id" value="{{ data.menu_item_id }}" />
+            <input type="hidden" name="menu-item-parent-id[{{ data.menu_item_id }}]" class="menu-item-data-parent-id" value="{{ data.parent }}" />
+        </div><!-- .menu-item-settings-->
+        <ul class="menu-item-transport"></ul>
+        <?php
+    }
+
+    /**
+     * Return params for this control.
+     *
+     * @since 4.3.0
+     *
+     * @return array
+     */
+    function json() {
+        $exported                 = parent::json();
+        $exported['menu_item_id'] = $this->setting->post_id;
+
+        return $exported;
+    }
+}
+
+/**
+ * Customize Menu Location Control Class
+ *
+ * This custom control is only needed for JS.
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_Nav_Menu_Location_Control extends WP_Customize_Control {
+
+    /**
+     * Control type.
+     *
+     * @since 4.3.0
+     *
+     * @access public
+     * @var string
+     */
+    public $type = 'nav_menu_location';
+
+    /**
+     * Location ID.
+     *
+     * @since 4.3.0
+     *
+     * @access public
+     * @var string
+     */
+    public $location_id = '';
+
+    /**
+     * Refresh the parameters passed to JavaScript via JSON.
+     *
+     * @since 4.3.0
+     *
+     * @uses WP_Customize_Control::to_json()
+     */
+    public function to_json() {
+        parent::to_json();
+        $this->json['locationId'] = $this->location_id;
+    }
+
+    /**
+     * Render content just like a normal select control.
+     *
+     * @since 4.3.0
+     */
+    public function render_content() {
+        if ( empty( $this->choices ) ) {
+            return;
+        }
+        ?>
+        <label>
+            <?php if ( ! empty( $this->label ) ) : ?>
+            <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+            <?php endif; ?>
+
+            <?php if ( ! empty( $this->description ) ) : ?>
+            <span class="description customize-control-description"><?php echo $this->description; ?></span>
+            <?php endif; ?>
+
+            <select <?php $this->link(); ?>>
+                <?php
+                foreach ( $this->choices as $value => $label ) :
+                    echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+                endforeach;
+                ?>
+            </select>
+        </label>
+        <?php
+    }
+}
+
+/**
+ * Customize control to represent the name field for a given menu.
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_Nav_Menu_Name_Control extends WP_Customize_Control {
+
+    /**
+     * Type of control, used by JS.
+     *
+     * @since 4.3.0
+     *
+     * @var string
+     */
+    public $type = 'nav_menu_name';
+
+    /**
+     * No-op since we're using JS template.
+     *
+     * @since 4.3.0
+     */
+    protected function render_content() {}
+
+    /**
+     * Render the Underscore template for this control.
+     *
+     * @since 4.3.0
+     */
+    protected function content_template() {
+        ?>
+        <label>
+            <input type="text" class="menu-name-field live-update-section-title" />
+        </label>
+        <?php
+    }
+}
+
+/**
+ * Customize control class for new menus.
+ *
+ * @since 4.3.0
+ */
+class WP_New_Menu_Customize_Control extends WP_Customize_Control {
+
+    /**
+     * Control type.
+     *
+     * @since 4.3.0
+     *
+     * @access public
+     * @var string
+     */
+    public $type = 'new_menu';
+
+    /**
+     * Render the control's content.
+     *
+     * @since 4.3.0
+     */
+    public function render_content() {
+        ?>
+        <button type="button" class="button button-primary" id="create-new-menu-submit"><?php _e( 'Create Menu' ); ?></button>
+        <span class="spinner"></span>
+        <?php
+    }
+}

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -50 +50 @@
     public $widgets;
 
+    /**
+     * Methods and properties deailing with managing nav menus in the Customizer.
+     *
+     * @var WP_Customize_Nav_Menus
+     */
+    public $nav_menus;
+
     protected $settings   = array();
     protected $containers = array();
@@ -105 +112 @@
         require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
         require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
+        require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
 
         $this->widgets = new WP_Customize_Widgets( $this );
+        $this->nav_menus = new WP_Customize_Nav_Menus( $this );
 
         add_filter( 'wp_die_handler', array( $this, 'wp_die_handler' ) );
@@ -1482 +1491 @@
             foreach ( array( 'color', 'image', 'position_x', 'repeat', 'attachment' ) as $prop ) {
                 $this->get_setting( 'background_' . $prop )->transport = 'postMessage';
-            }
-        }
-
-        /* Nav Menus */
-
-        $locations      = get_registered_nav_menus();
-        $menus          = wp_get_nav_menus();
-        $num_locations  = count( array_keys( $locations ) );
-
-        if ( 1 == $num_locations ) {
-            $description = __( 'Your theme supports one menu. Select which menu you would like to use.' );
-        } else {
-            $description = sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) );
-        }
-
-        $this->add_section( 'nav', array(
-            'title'          => __( 'Navigation' ),
-            'theme_supports' => 'menus',
-            'priority'       => 100,
-            'description'    => $description . "\n\n" . __( 'You can edit your menu content on the Menus screen in the Appearance section.' ),
-        ) );
-
-        if ( $menus ) {
-            $choices = array( '' => __( '— Select —' ) );
-            foreach ( $menus as $menu ) {
-                $choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '…' );
-            }
-
-            foreach ( $locations as $location => $description ) {
-                $menu_setting_id = "nav_menu_locations[{$location}]";
-
-                $this->add_setting( $menu_setting_id, array(
-                    'sanitize_callback' => 'absint',
-                    'theme_supports'    => 'menus',
-                ) );
-
-                $this->add_control( $menu_setting_id, array(
-                    'label'   => $description,
-                    'section' => 'nav',
-                    'type'    => 'select',
-                    'choices' => $choices,
-                ) );
             }
         }

trunk/src/wp-includes/class-wp-customize-section.php

@@ -502 +502 @@
     }
 }
+
+/**
+ * Customize Menu Section Class
+ *
+ * Custom section only needed in JS.
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_Nav_Menu_Section extends WP_Customize_Section {
+
+    /**
+     * Control type.
+     *
+     * @since 4.3.0
+     *
+     * @access public
+     * @var string
+     */
+    public $type = 'nav_menu';
+
+    /**
+     * Get section params for JS.
+     *
+     * @since 4.3.0
+     *
+     * @return array
+     */
+    function json() {
+        $exported = parent::json();
+        $exported['menu_id'] = intval( preg_replace( '/^nav_menu\[(\d+)\]/', '$1', $this->id ) );
+
+        return $exported;
+    }
+}
+
+/**
+ * Customize Menu Section Class
+ *
+ * Implements the new-menu-ui toggle button instead of a regular section.
+ *
+ * @since 4.3.0
+ */
+class WP_Customize_New_Menu_Section extends WP_Customize_Section {
+
+    /**
+     * Control type.
+     *
+     * @since 4.3.0
+     *
+     * @access public
+     * @var string
+     */
+    public $type = 'new_menu';
+
+    /**
+     * Render the section, and the controls that have been added to it.
+     *
+     * @since 4.3.0
+     */
+    protected function render() {
+        ?>
+        <li id="accordion-section-<?php echo esc_attr( $this->id ); ?>" class="accordion-section-new-menu">
+            <button type="button" class="button-secondary add-new-menu-item add-menu-toggle">
+                <?php echo esc_html( $this->title ); ?>
+                <span class="screen-reader-text"><?php _e( 'Press return or enter to open' ); ?></span>
+            </button>
+            <ul class="new-menu-section-content"></ul>
+        </li>
+        <?php
+    }
+}

trunk/src/wp-includes/class-wp-customize-setting.php

@@ -631 +631 @@
     }
 }
+
+/**
+ * Customize Setting to represent a nav_menu.
+ *
+ * Subclass of WP_Customize_Setting to represent a nav_menu taxonomy term, and
+ * the IDs for the nav_menu_items associated with the nav menu.
+ *
+ * @since 4.3.0
+ *
+ * @see wp_get_nav_menu_items()
+ * @see WP_Customize_Setting
+ */
+class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
+
+    const ID_PATTERN = '/^nav_menu_item\[(?P<id>-?\d+)\]$/';
+
+    const POST_TYPE = 'nav_menu_item';
+
+    const TYPE = 'nav_menu_item';
+
+    /**
+     * Setting type.
+     *
+     * @since 4.3.0
+     *
+     * @var string
+     */
+    public $type = self::TYPE;
+
+    /**
+     * Default setting value.
+     *
+     * @since 4.3.0
+     *
+     * @see wp_setup_nav_menu_item()
+     * @var array
+     */
+    public $default = array(
+        // The $menu_item_data for wp_update_nav_menu_item().
+        'object_id'        => 0,
+        'object'           => '', // Taxonomy name.
+        'menu_item_parent' => 0, // A.K.A. menu-item-parent-id; note that post_parent is different, and not included.
+        'position'         => 0, // A.K.A. menu_order.
+        'type'             => 'custom', // Note that type_label is not included here.
+        'title'            => '',
+        'url'              => '',
+        'target'           => '',
+        'attr_title'       => '',
+        'description'      => '',
+        'classes'          => '',
+        'xfn'              => '',
+        'status'           => 'publish',
+        'original_title'   => '',
+        'nav_menu_term_id' => 0, // This will be supplied as the $menu_id arg for wp_update_nav_menu_item().
+        // @todo also expose invalid?
+    );
+
+    /**
+     * Default transport.
+     *
+     * @since 4.3.0
+     *
+     * @var string
+     */
+    public $transport = 'postMessage';
+
+    /**
+     * The post ID represented by this setting instance. This is the db_id.
+     *
+     * A negative value represents a placeholder ID for a new menu not yet saved.
+     *
+     * @todo Should this be $db_id, and also use this for WP_Customize_Nav_Menu_Setting::$term_id
+     *
+     * @since 4.3.0
+     *
+     * @var int
+     */
+    public $post_id;
+
+    /**
+     * Previous (placeholder) post ID used before creating a new menu item.
+     *
+     * This value will be exported to JS via the customize_save_response filter
+     * so that JavaScript can update the settings to refer to the newly-assigned
+     * post ID. This value is always negative to indicate it does not refer to
+     * a real post.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Item_Setting::update()
+     * @see WP_Customize_Nav_Menu_Item_Setting::amend_customize_save_response()
+     *
+     * @var int
+     */
+    public $previous_post_id;
+
+    /**
+     * When previewing or updating a menu item, this stores the previous nav_menu_term_id
+     * which ensures that we can apply the proper filters.
+     *
+     * @since 4.3.0
+     *
+     * @var int
+     */
+    public $original_nav_menu_term_id;
+
+    /**
+     * Whether or not preview() was called.
+     *
+     * @since 4.3.0
+     *
+     * @var bool
+     */
+    protected $is_previewed = false;
+
+    /**
+     * Whether or not update() was called.
+     *
+     * @since 4.3.0
+     *
+     * @var bool
+     */
+    protected $is_updated = false;
+
+    /**
+     * Status for calling the update method, used in customize_save_response filter.
+     *
+     * When status is inserted, the placeholder post ID is stored in $previous_post_id.
+     * When status is error, the error is stored in $update_error.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Item_Setting::update()
+     * @see WP_Customize_Nav_Menu_Item_Setting::amend_customize_save_response()
+     *
+     * @var string updated|inserted|deleted|error
+     */
+    public $update_status;
+
+    /**
+     * Any error object returned by wp_update_nav_menu_item() when setting is updated.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Item_Setting::update()
+     * @see WP_Customize_Nav_Menu_Item_Setting::amend_customize_save_response()
+     *
+     * @var WP_Error
+     */
+    public $update_error;
+
+    /**
+     * Constructor.
+     *
+     * Any supplied $args override class property defaults.
+     *
+     * @since 4.3.0
+     *
+     * @param WP_Customize_Manager $manager Manager instance.
+     * @param string               $id      An specific ID of the setting. Can be a
+     *                                      theme mod or option name.
+     * @param array                $args    Optional. Setting arguments.
+     * @throws Exception If $id is not valid for this setting type.
+     */
+    public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) {
+        if ( empty( $manager->nav_menus ) ) {
+            throw new Exception( 'Expected WP_Customize_Manager::$nav_menus to be set.' );
+        }
+
+        if ( ! preg_match( self::ID_PATTERN, $id, $matches ) ) {
+            throw new Exception( "Illegal widget setting ID: $id" );
+        }
+
+        $this->post_id = intval( $matches['id'] );
+
+        $menu = $this->value();
+        $this->original_nav_menu_term_id = $menu['nav_menu_term_id'];
+
+        parent::__construct( $manager, $id, $args );
+    }
+
+    /**
+     * Get the instance data for a given widget setting.
+     *
+     * @since 4.3.0
+     *
+     * @see wp_setup_nav_menu_item()
+     *
+     * @return array
+     */
+    public function value() {
+        if ( $this->is_previewed && $this->_previewed_blog_id === get_current_blog_id() ) {
+            $undefined  = new stdClass(); // Symbol.
+            $post_value = $this->post_value( $undefined );
+
+            if ( $undefined === $post_value ) {
+                $value = $this->_original_value;
+            } else {
+                $value = $post_value;
+            }
+        } else {
+            $value = false;
+
+            // Note that a ID of less than one indicates a nav_menu not yet inserted.
+            if ( $this->post_id > 0 ) {
+                $post = get_post( $this->post_id );
+                if ( $post && self::POST_TYPE === $post->post_type ) {
+                    $item  = wp_setup_nav_menu_item( $post );
+                    $value = wp_array_slice_assoc(
+                        (array) $item,
+                        array_keys( $this->default )
+                    );
+                    $value['position']       = $item->menu_order;
+                    $value['status']         = $item->post_status;
+                    $value['original_title'] = '';
+
+                    $menus = wp_get_post_terms( $post->ID, WP_Customize_Nav_Menu_Setting::TAXONOMY, array(
+                        'fields' => 'ids',
+                    ) );
+
+                    if ( ! empty( $menus ) ) {
+                        $value['nav_menu_term_id'] = array_shift( $menus );
+                    } else {
+                        $value['nav_menu_term_id'] = 0;
+                    }
+
+                    if ( 'post_type' === $value['type'] ) {
+                        $original_title = get_the_title( $value['object_id'] );
+                    } else if ( 'taxonomy' === $value['type'] ) {
+                        $original_title = get_term_field( 'name', $value['object_id'], $value['object'], 'raw' );
+                        if ( is_wp_error( $original_title ) ) {
+                            $original_title = '';
+                        }
+                    }
+
+                    if ( ! empty( $original_title ) ) {
+                        $value['original_title'] = $original_title;
+                    }
+                }
+            }
+
+            if ( ! is_array( $value ) ) {
+                $value = $this->default;
+            }
+        }
+
+        if ( is_array( $value ) ) {
+            foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
+                $value[ $key ] = intval( $value[ $key ] );
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Handle previewing the setting.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Manager::post_value()
+     */
+    public function preview() {
+        if ( $this->is_previewed ) {
+            return;
+        }
+
+        $this->is_previewed              = true;
+        $this->_original_value           = $this->value();
+        $this->original_nav_menu_term_id = $this->_original_value['nav_menu_term_id'];
+        $this->_previewed_blog_id        = get_current_blog_id();
+
+        add_filter( 'wp_get_nav_menu_items', array( $this, 'filter_wp_get_nav_menu_items' ), 10, 3 );
+
+        $sort_callback = array( __CLASS__, 'sort_wp_get_nav_menu_items' );
+        if ( ! has_filter( 'wp_get_nav_menu_items', $sort_callback ) ) {
+            add_filter( 'wp_get_nav_menu_items', array( __CLASS__, 'sort_wp_get_nav_menu_items' ), 1000, 3 );
+        }
+
+        // @todo Add get_post_metadata filters for plugins to add their data.
+    }
+
+    /**
+     * Filter the wp_get_nav_menu_items() result to supply the previewed menu items.
+     *
+     * @since 4.3.0
+     *
+     * @see wp_get_nav_menu_items()
+     *
+     * @param array  $items An array of menu item post objects.
+     * @param object $menu  The menu object.
+     * @param array  $args  An array of arguments used to retrieve menu item objects.
+     * @return array Array of menu items,
+     */
+    function filter_wp_get_nav_menu_items( $items, $menu, $args ) {
+        $this_item = $this->value();
+        $current_nav_menu_term_id = $this_item['nav_menu_term_id'];
+        unset( $this_item['nav_menu_term_id'] );
+
+        $should_filter = (
+            $menu->term_id === $this->original_nav_menu_term_id
+            ||
+            $menu->term_id === $current_nav_menu_term_id
+        );
+        if ( ! $should_filter ) {
+            return $items;
+        }
+
+        // Handle deleted menu item, or menu item moved to another menu.
+        $should_remove = (
+            false === $this_item
+            ||
+            (
+                $this->original_nav_menu_term_id === $menu->term_id
+                &&
+                $current_nav_menu_term_id !== $this->original_nav_menu_term_id
+            )
+        );
+        if ( $should_remove ) {
+            $filtered_items = array();
+            foreach ( $items as $item ) {
+                if ( $item->db_id !== $this->post_id ) {
+                    $filtered_items[] = $item;
+                }
+            }
+            return $filtered_items;
+        }
+
+        $mutated = false;
+        $should_update = (
+            is_array( $this_item )
+            &&
+            $current_nav_menu_term_id === $menu->term_id
+        );
+        if ( $should_update ) {
+            foreach ( $items as $item ) {
+                if ( $item->db_id === $this->post_id ) {
+                    foreach ( get_object_vars( $this->value_as_wp_post_nav_menu_item() ) as $key => $value ) {
+                        $item->$key = $value;
+                    }
+                    $mutated = true;
+                }
+            }
+
+            // Not found so we have to append it..
+            if ( ! $mutated ) {
+                $items[] = $this->value_as_wp_post_nav_menu_item();
+            }
+        }
+
+        return $items;
+    }
+
+    /**
+     * Re-apply the tail logic also applied on $items by wp_get_nav_menu_items().
+     *
+     * @since 4.3.0
+     *
+     * @see wp_get_nav_menu_items()
+     *
+     * @param array  $items An array of menu item post objects.
+     * @param object $menu  The menu object.
+     * @param array  $args  An array of arguments used to retrieve menu item objects.
+     * @return array Array of menu items,
+     */
+    static function sort_wp_get_nav_menu_items( $items, $menu, $args ) {
+        // @todo We should probably re-apply some constraints imposed by $args.
+        unset( $args['include'] );
+
+        // Remove invalid items only in frontend.
+        if ( ! is_admin() ) {
+            $items = array_filter( $items, '_is_valid_nav_menu_item' );
+        }
+
+        if ( ARRAY_A === $args['output'] ) {
+            $GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
+            usort( $items, '_sort_nav_menu_items' );
+            $i = 1;
+
+            foreach ( $items as $k => $item ) {
+                $items[ $k ]->$args['output_key'] = $i++;
+            }
+        }
+
+        return $items;
+    }
+
+    /**
+     * Get the value emulated into a WP_Post and set up as a nav_menu_item.
+     *
+     * @since 4.3.0
+     *
+     * @return WP_Post With {@see wp_setup_nav_menu_item()} applied.
+     */
+    public function value_as_wp_post_nav_menu_item() {
+        $item = (object) $this->value();
+        unset( $item->nav_menu_term_id );
+
+        $item->post_status = $item->status;
+        unset( $item->status );
+
+        $item->post_type = 'nav_menu_item';
+        $item->menu_order = $item->position;
+        unset( $item->position );
+
+        $item->post_author = get_current_user_id();
+
+        if ( $item->title ) {
+            $item->post_title = $item->title;
+        }
+
+        $item->ID = $this->post_id;
+        $post = new WP_Post( (object) $item );
+        $post = wp_setup_nav_menu_item( $post );
+
+        return $post;
+    }
+
+    /**
+     * Sanitize an input.
+     *
+     * Note that parent::sanitize() erroneously does wp_unslash() on $value, but
+     * we remove that in this override.
+     *
+     * @since 4.3.0
+     *
+     * @param array $menu_item_value The value to sanitize.
+     * @return array|false|null Null if an input isn't valid. False if it is marked for deletion. Otherwise the sanitized value.
+     */
+    public function sanitize( $menu_item_value ) {
+        // Menu is marked for deletion.
+        if ( false === $menu_item_value ) {
+            return $menu_item_value;
+        }
+
+        // Invalid.
+        if ( ! is_array( $menu_item_value ) ) {
+            return null;
+        }
+
+        $default = array(
+            'object_id'        => 0,
+            'object'           => '',
+            'menu_item_parent' => 0,
+            'position'         => 0,
+            'type'             => 'custom',
+            'title'            => '',
+            'url'              => '',
+            'target'           => '',
+            'attr_title'       => '',
+            'description'      => '',
+            'classes'          => '',
+            'xfn'              => '',
+            'status'           => 'publish',
+            'original_title'   => '',
+            'nav_menu_term_id' => 0,
+        );
+        $menu_item_value = array_merge( $default, $menu_item_value );
+        $menu_item_value = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) );
+        $menu_item_value['position'] = max( 0, intval( $menu_item_value['position'] ) );
+
+        foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
+            // Note we need to allow negative-integer IDs for previewed objects not inserted yet.
+            $menu_item_value[ $key ] = intval( $menu_item_value[ $key ] );
+        }
+
+        foreach ( array( 'type', 'object', 'target' ) as $key ) {
+            $menu_item_value[ $key ] = sanitize_key( $menu_item_value[ $key ] );
+        }
+
+        foreach ( array( 'xfn', 'classes' ) as $key ) {
+            $value = $menu_item_value[ $key ];
+            if ( ! is_array( $value ) ) {
+                $value = explode( ' ', $value );
+            }
+            $menu_item_value[ $key ] = implode( ' ', array_map( 'sanitize_html_class', $value ) );
+        }
+
+        foreach ( array( 'title', 'attr_title', 'description', 'original_title' ) as $key ) {
+            // @todo Should esc_attr() the attr_title as well?
+            $menu_item_value[ $key ] = sanitize_text_field( $menu_item_value[ $key ] );
+        }
+
+        $menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
+        if ( ! get_post_status_object( $menu_item_value['status'] ) ) {
+            $menu_item_value['status'] = 'publish';
+        }
+
+        /** This filter is documented in wp-includes/class-wp-customize-setting.php */
+        return apply_filters( "customize_sanitize_{$this->id}", $menu_item_value, $this );
+    }
+
+    /**
+     * Create/update the nav_menu_item post for this setting.
+     *
+     * Any created menu items will have their assigned post IDs exported to the client
+     * via the customize_save_response filter. Likewise, any errors will be exported
+     * to the client via the customize_save_response() filter.
+     *
+     * To delete a menu, the client can send false as the value.
+     *
+     * @since 4.3.0
+     *
+     * @see wp_update_nav_menu_item()
+     *
+     * @param array|false $value The menu item array to update. If false, then the menu item will be deleted entirely.
+     *                           See {@see WP_Customize_Nav_Menu_Item_Setting::$default} for what the value should
+     *                           consist of.
+     * @return void
+     */
+    protected function update( $value ) {
+        if ( $this->is_updated ) {
+            return;
+        }
+
+        $this->is_updated = true;
+        $is_placeholder   = ( $this->post_id < 0 );
+        $is_delete        = ( false === $value );
+
+        add_filter( 'customize_save_response', array( $this, 'amend_customize_save_response' ) );
+
+        if ( $is_delete ) {
+            // If the current setting post is a placeholder, a delete request is a no-op.
+            if ( $is_placeholder ) {
+                $this->update_status = 'deleted';
+            } else {
+                $r = wp_delete_post( $this->post_id, true );
+
+                if ( false === $r ) {
+                    $this->update_error  = new WP_Error( 'delete_failure' );
+                    $this->update_status = 'error';
+                } else {
+                    $this->update_status = 'deleted';
+                }
+                // @todo send back the IDs for all associated nav menu items deleted, so these settings (and controls) can be removed from Customizer?
+            }
+        } else {
+
+            // Handle saving menu items for menus that are being newly-created.
+            if ( $value['nav_menu_term_id'] < 0 ) {
+                $nav_menu_setting_id = sprintf( 'nav_menu[%s]', $value['nav_menu_term_id'] );
+                $nav_menu_setting    = $this->manager->get_setting( $nav_menu_setting_id );
+
+                if ( ! $nav_menu_setting || ! ( $nav_menu_setting instanceof WP_Customize_Nav_Menu_Setting ) ) {
+                    $this->update_status = 'error';
+                    $this->update_error  = new WP_Error( 'unexpected_nav_menu_setting' );
+                    return;
+                }
+
+                if ( false === $nav_menu_setting->save() ) {
+                    $this->update_status = 'error';
+                    $this->update_error  = new WP_Error( 'nav_menu_setting_failure' );
+                }
+
+                if ( $nav_menu_setting->previous_term_id !== intval( $value['nav_menu_term_id'] ) ) {
+                    $this->update_status = 'error';
+                    $this->update_error  = new WP_Error( 'unexpected_previous_term_id' );
+                    return;
+                }
+
+                $value['nav_menu_term_id'] = $nav_menu_setting->term_id;
+            }
+
+            // Handle saving a nav menu item that is a child of a nav menu item being newly-created.
+            if ( $value['menu_item_parent'] < 0 ) {
+                $parent_nav_menu_item_setting_id = sprintf( 'nav_menu_item[%s]', $value['menu_item_parent'] );
+                $parent_nav_menu_item_setting    = $this->manager->get_setting( $parent_nav_menu_item_setting_id );
+
+                if ( ! $parent_nav_menu_item_setting || ! ( $parent_nav_menu_item_setting instanceof WP_Customize_Nav_Menu_Item_Setting ) ) {
+                    $this->update_status = 'error';
+                    $this->update_error  = new WP_Error( 'unexpected_nav_menu_item_setting' );
+                    return;
+                }
+
+                if ( false === $parent_nav_menu_item_setting->save() ) {
+                    $this->update_status = 'error';
+                    $this->update_error  = new WP_Error( 'nav_menu_item_setting_failure' );
+                }
+
+                if ( $parent_nav_menu_item_setting->previous_post_id !== intval( $value['menu_item_parent'] ) ) {
+                    $this->update_status = 'error';
+                    $this->update_error  = new WP_Error( 'unexpected_previous_post_id' );
+                    return;
+                }
+
+                $value['menu_item_parent'] = $parent_nav_menu_item_setting->post_id;
+            }
+
+            // Insert or update menu.
+            $menu_item_data = array(
+                'menu-item-object-id'   => $value['object_id'],
+                'menu-item-object'      => $value['object'],
+                'menu-item-parent-id'   => $value['menu_item_parent'],
+                'menu-item-position'    => $value['position'],
+                'menu-item-type'        => $value['type'],
+                'menu-item-title'       => $value['title'],
+                'menu-item-url'         => $value['url'],
+                'menu-item-description' => $value['description'],
+                'menu-item-attr-title'  => $value['attr_title'],
+                'menu-item-target'      => $value['target'],
+                'menu-item-classes'     => $value['classes'],
+                'menu-item-xfn'         => $value['xfn'],
+                'menu-item-status'      => $value['status'],
+            );
+
+            $r = wp_update_nav_menu_item(
+                $value['nav_menu_term_id'],
+                $is_placeholder ? 0 : $this->post_id,
+                $menu_item_data
+            );
+
+            if ( is_wp_error( $r ) ) {
+                $this->update_status = 'error';
+                $this->update_error = $r;
+            } else {
+                if ( $is_placeholder ) {
+                    $this->previous_post_id = $this->post_id;
+                    $this->post_id = $r;
+                    $this->update_status = 'inserted';
+                } else {
+                    $this->update_status = 'updated';
+                }
+            }
+        }
+
+    }
+
+    /**
+     * Export data for the JS client.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Item_Setting::update()
+     *
+     * @param array $data Additional information passed back to the 'saved' event on `wp.customize`.
+     * @return array
+     */
+    function amend_customize_save_response( $data ) {
+        if ( ! isset( $data['nav_menu_item_updates'] ) ) {
+            $data['nav_menu_item_updates'] = array();
+        }
+
+        $data['nav_menu_item_updates'][] = array(
+            'post_id'          => $this->post_id,
+            'previous_post_id' => $this->previous_post_id,
+            'error'            => $this->update_error ? $this->update_error->get_error_code() : null,
+            'status'           => $this->update_status,
+        );
+
+        return $data;
+    }
+}
+
+/**
+ * Customize Setting to represent a nav_menu.
+ *
+ * Subclass of WP_Customize_Setting to represent a nav_menu taxonomy term, and
+ * the IDs for the nav_menu_items associated with the nav menu.
+ *
+ * @since 4.3.0
+ *
+ * @see wp_get_nav_menu_object()
+ * @see WP_Customize_Setting
+ */
+class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
+
+    const ID_PATTERN = '/^nav_menu\[(?P<id>-?\d+)\]$/';
+
+    const TAXONOMY = 'nav_menu';
+
+    const TYPE = 'nav_menu';
+
+    /**
+     * Setting type.
+     *
+     * @since 4.3.0
+     *
+     * @var string
+     */
+    public $type = self::TYPE;
+
+    /**
+     * Default setting value.
+     *
+     * @since 4.3.0
+     *
+     * @see wp_get_nav_menu_object()
+     *
+     * @var array
+     */
+    public $default = array(
+        'name'        => '',
+        'description' => '',
+        'parent'      => 0,
+        'auto_add'    => false,
+    );
+
+    /**
+     * Default transport.
+     *
+     * @since 4.3.0
+     *
+     * @var string
+     */
+    public $transport = 'postMessage';
+
+    /**
+     * The term ID represented by this setting instance.
+     *
+     * A negative value represents a placeholder ID for a new menu not yet saved.
+     *
+     * @since 4.3.0
+     *
+     * @var int
+     */
+    public $term_id;
+
+    /**
+     * Previous (placeholder) term ID used before creating a new menu.
+     *
+     * This value will be exported to JS via the customize_save_response filter
+     * so that JavaScript can update the settings to refer to the newly-assigned
+     * term ID. This value is always negative to indicate it does not refer to
+     * a real term.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Setting::update()
+     * @see WP_Customize_Nav_Menu_Setting::amend_customize_save_response()
+     *
+     * @var int
+     */
+    public $previous_term_id;
+
+    /**
+     * Whether or not preview() was called.
+     *
+     * @since 4.3.0
+     *
+     * @var bool
+     */
+    protected $is_previewed = false;
+
+    /**
+     * Whether or not update() was called.
+     *
+     * @since 4.3.0
+     *
+     * @var bool
+     */
+    protected $is_updated = false;
+
+    /**
+     * Status for calling the update method, used in customize_save_response filter.
+     *
+     * When status is inserted, the placeholder term ID is stored in $previous_term_id.
+     * When status is error, the error is stored in $update_error.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Setting::update()
+     * @see WP_Customize_Nav_Menu_Setting::amend_customize_save_response()
+     *
+     * @var string updated|inserted|deleted|error
+     */
+    public $update_status;
+
+    /**
+     * Any error object returned by wp_update_nav_menu_object() when setting is updated.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Setting::update()
+     * @see WP_Customize_Nav_Menu_Setting::amend_customize_save_response()
+     *
+     * @var WP_Error
+     */
+    public $update_error;
+
+    /**
+     * Constructor.
+     *
+     * Any supplied $args override class property defaults.
+     *
+     * @since 4.3.0
+     *
+     * @param WP_Customize_Manager $manager Manager instance.
+     * @param string               $id      An specific ID of the setting. Can be a
+     *                                      theme mod or option name.
+     * @param array                $args    Optional. Setting arguments.
+     * @throws Exception If $id is not valid for this setting type.
+     */
+    public function __construct( WP_Customize_Manager $manager, $id, array $args = array() ) {
+        if ( empty( $manager->nav_menus ) ) {
+            throw new Exception( 'Expected WP_Customize_Manager::$nav_menus to be set.' );
+        }
+
+        if ( ! preg_match( self::ID_PATTERN, $id, $matches ) ) {
+            throw new Exception( "Illegal widget setting ID: $id" );
+        }
+
+        $this->term_id = intval( $matches['id'] );
+
+        parent::__construct( $manager, $id, $args );
+    }
+
+    /**
+     * Get the instance data for a given widget setting.
+     *
+     * @since 4.3.0
+     *
+     * @see wp_get_nav_menu_object()
+     *
+     * @return array
+     */
+    public function value() {
+        if ( $this->is_previewed && $this->_previewed_blog_id === get_current_blog_id() ) {
+            $undefined  = new stdClass(); // Symbol.
+            $post_value = $this->post_value( $undefined );
+
+            if ( $undefined === $post_value ) {
+                $value = $this->_original_value;
+            } else {
+                $value = $post_value;
+            }
+        } else {
+            $value = false;
+
+            // Note that a term_id of less than one indicates a nav_menu not yet inserted.
+            if ( $this->term_id > 0 ) {
+                $term = wp_get_nav_menu_object( $this->term_id );
+
+                if ( $term ) {
+                    $value = wp_array_slice_assoc( (array) $term, array_keys( $this->default ) );
+
+                    $nav_menu_options  = (array) get_option( 'nav_menu_options', array() );
+                    $value['auto_add'] = false;
+
+                    if ( isset( $nav_menu_options['auto_add'] ) && is_array( $nav_menu_options['auto_add'] ) ) {
+                        $value['auto_add'] = in_array( $term->term_id, $nav_menu_options['auto_add'] );
+                    }
+                }
+            }
+
+            if ( ! is_array( $value ) ) {
+                $value = $this->default;
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * Handle previewing the setting.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Manager::post_value()
+     */
+    public function preview() {
+        if ( $this->is_previewed ) {
+            return;
+        }
+
+        $this->is_previewed       = true;
+        $this->_original_value    = $this->value();
+        $this->_previewed_blog_id = get_current_blog_id();
+
+        add_filter( 'wp_get_nav_menu_object', array( $this, 'filter_wp_get_nav_menu_object' ), 10, 2 );
+        add_filter( 'default_option_nav_menu_options', array( $this, 'filter_nav_menu_options' ) );
+        add_filter( 'option_nav_menu_options', array( $this, 'filter_nav_menu_options' ) );
+    }
+
+    /**
+     * Filter the wp_get_nav_menu_object() result to supply the previewed menu object.
+     *
+     * Requesting a nav_menu object by anything but ID is not supported.
+     *
+     * @since 4.3.0
+     *
+     * @see wp_get_nav_menu_object()
+     *
+     * @param object|null $menu_obj Object returned by wp_get_nav_menu_object().
+     * @param string      $menu_id  ID of the nav_menu term. Requests by slug or name will be ignored.
+     * @return object|null
+     */
+    function filter_wp_get_nav_menu_object( $menu_obj, $menu_id ) {
+        $ok = (
+            get_current_blog_id() === $this->_previewed_blog_id
+            &&
+            is_int( $menu_id )
+            &&
+            $menu_id === $this->term_id
+        );
+        if ( ! $ok ) {
+            return $menu_obj;
+        }
+
+        $setting_value = $this->value();
+
+        // Handle deleted menus.
+        if ( false === $setting_value ) {
+            return false;
+        }
+
+        // Handle sanitization failure by preventing short-circuiting.
+        if ( null === $setting_value ) {
+            return $menu_obj;
+        }
+
+        $menu_obj = (object) array_merge( array(
+                'term_id'          => $this->term_id,
+                'term_taxonomy_id' => $this->term_id,
+                'slug'             => sanitize_title( $setting_value['name'] ),
+                'count'            => 0,
+                'term_group'       => 0,
+                'taxonomy'         => self::TAXONOMY,
+                'filter'           => 'raw',
+            ), $setting_value );
+
+        return $menu_obj;
+    }
+
+    /**
+     * Filter the nav_menu_options option to include this menu's auto_add preference.
+     *
+     * @since 4.3.0
+     *
+     * @param array $nav_menu_options Nav menu options including auto_add.
+     * @return array
+     */
+    function filter_nav_menu_options( $nav_menu_options ) {
+        if ( $this->_previewed_blog_id !== get_current_blog_id() ) {
+            return $nav_menu_options;
+        }
+
+        $menu = $this->value();
+        $nav_menu_options = $this->filter_nav_menu_options_value(
+            $nav_menu_options,
+            $this->term_id,
+            false === $menu ? false : $menu['auto_add']
+        );
+
+        return $nav_menu_options;
+    }
+
+    /**
+     * Sanitize an input.
+     *
+     * Note that parent::sanitize() erroneously does wp_unslash() on $value, but
+     * we remove that in this override.
+     *
+     * @since 4.3.0
+     *
+     * @param array $value The value to sanitize.
+     * @return array|false|null Null if an input isn't valid. False if it is marked for deletion. Otherwise the sanitized value.
+     */
+    public function sanitize( $value ) {
+        // Menu is marked for deletion.
+        if ( false === $value ) {
+            return $value;
+        }
+
+        // Invalid.
+        if ( ! is_array( $value ) ) {
+            return null;
+        }
+
+        $default = array(
+            'name'        => '',
+            'description' => '',
+            'parent'      => 0,
+            'auto_add'    => false,
+        );
+        $value = array_merge( $default, $value );
+        $value = wp_array_slice_assoc( $value, array_keys( $default ) );
+
+        $value['name']        = trim( esc_html( $value['name'] ) ); // This sanitization code is used in wp-admin/nav-menus.php.
+        $value['description'] = sanitize_text_field( $value['description'] );
+        $value['parent']      = max( 0, intval( $value['parent'] ) );
+        $value['auto_add']    = ! empty( $value['auto_add'] );
+
+        /** This filter is documented in wp-includes/class-wp-customize-setting.php */
+        return apply_filters( "customize_sanitize_{$this->id}", $value, $this );
+    }
+
+    /**
+     * Create/update the nav_menu term for this setting.
+     *
+     * Any created menus will have their assigned term IDs exported to the client
+     * via the customize_save_response filter. Likewise, any errors will be exported
+     * to the client via the customize_save_response() filter.
+     *
+     * To delete a menu, the client can send false as the value.
+     *
+     * @since 4.3.0
+     *
+     * @see wp_update_nav_menu_object()
+     *
+     * @param array|false $value {
+     *     The value to update. Note that slug cannot be updated via wp_update_nav_menu_object().
+     *     If false, then the menu will be deleted entirely.
+     *
+     *     @type string $name        The name of the menu to save.
+     *     @type string $description The term description. Default empty string.
+     *     @type int    $parent      The id of the parent term. Default 0.
+     *     @type bool   $auto_add    Whether pages will auto_add to this menu. Default false.
+     * }
+     * @return void
+     */
+    protected function update( $value ) {
+        if ( $this->is_updated ) {
+            return;
+        }
+
+        $this->is_updated = true;
+        $is_placeholder   = ( $this->term_id < 0 );
+        $is_delete        = ( false === $value );
+
+        add_filter( 'customize_save_response', array( $this, 'amend_customize_save_response' ) );
+
+        $auto_add = null;
+        if ( $is_delete ) {
+            // If the current setting term is a placeholder, a delete request is a no-op.
+            if ( $is_placeholder ) {
+                $this->update_status = 'deleted';
+            } else {
+                $r = wp_delete_nav_menu( $this->term_id );
+
+                if ( is_wp_error( $r ) ) {
+                    $this->update_status = 'error';
+                    $this->update_error  = $r;
+                } else {
+                    $this->update_status = 'deleted';
+                    $auto_add = false;
+                }
+            }
+        } else {
+            // Insert or update menu.
+            $menu_data = wp_array_slice_assoc( $value, array( 'description', 'parent' ) );
+            if ( isset( $value['name'] ) ) {
+                $menu_data['menu-name'] = $value['name'];
+            }
+
+            $r = wp_update_nav_menu_object( $is_placeholder ? 0 : $this->term_id, $menu_data );
+            if ( is_wp_error( $r ) ) {
+                $this->update_status = 'error';
+                $this->update_error  = $r;
+            } else {
+                if ( $is_placeholder ) {
+                    $this->previous_term_id = $this->term_id;
+                    $this->term_id          = $r;
+                    $this->update_status    = 'inserted';
+                } else {
+                    $this->update_status = 'updated';
+                }
+
+                $auto_add = $value['auto_add'];
+            }
+        }
+
+        if ( null !== $auto_add ) {
+            $nav_menu_options = $this->filter_nav_menu_options_value(
+                (array) get_option( 'nav_menu_options', array() ),
+                $this->term_id,
+                $auto_add
+            );
+            update_option( 'nav_menu_options', $nav_menu_options );
+        }
+
+        // Make sure that new menus assigned to nav menu locations use their new IDs.
+        if ( 'inserted' === $this->update_status ) {
+            foreach ( $this->manager->settings() as $setting ) {
+                if ( ! preg_match( '/^nav_menu_locations\[/', $setting->id ) ) {
+                    continue;
+                }
+
+                $post_value = $setting->post_value( null );
+                if ( ! is_null( $post_value ) && $this->previous_term_id === intval( $post_value ) ) {
+                    $this->manager->set_post_value( $setting->id, $this->term_id );
+                    $setting->save();
+                }
+            }
+        }
+    }
+
+    /**
+     * Update a nav_menu_options array.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Setting::filter_nav_menu_options()
+     * @see WP_Customize_Nav_Menu_Setting::update()
+     *
+     * @param array $nav_menu_options Array as returned by get_option( 'nav_menu_options' ).
+     * @param int   $menu_id          The term ID for the given menu.
+     * @param bool  $auto_add         Whether to auto-add or not.
+     * @return array
+     */
+    protected function filter_nav_menu_options_value( $nav_menu_options, $menu_id, $auto_add ) {
+        $nav_menu_options = (array) $nav_menu_options;
+        if ( ! isset( $nav_menu_options['auto_add'] ) ) {
+            $nav_menu_options['auto_add'] = array();
+        }
+
+        $i = array_search( $menu_id, $nav_menu_options['auto_add'] );
+        if ( $auto_add && false === $i ) {
+            array_push( $nav_menu_options['auto_add'], $this->term_id );
+        } else if ( ! $auto_add && false !== $i ) {
+            array_splice( $nav_menu_options['auto_add'], $i, 1 );
+        }
+
+        return $nav_menu_options;
+    }
+
+    /**
+     * Export data for the JS client.
+     *
+     * @since 4.3.0
+     *
+     * @see WP_Customize_Nav_Menu_Setting::update()
+     *
+     * @param array $data Additional information passed back to the 'saved' event on `wp.customize`.
+     * @return array
+     */
+    function amend_customize_save_response( $data ) {
+        if ( ! isset( $data['nav_menu_updates'] ) ) {
+            $data['nav_menu_updates'] = array();
+        }
+
+        $data['nav_menu_updates'][] = array(
+            'term_id'          => $this->term_id,
+            'previous_term_id' => $this->previous_term_id,
+            'error'            => $this->update_error ? $this->update_error->get_error_code() : null,
+            'status'           => $this->update_status,
+        );
+
+        return $data;
+    }
+}

trunk/src/wp-includes/script-loader.php

@@ -407 +407 @@
     $scripts->add( 'customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
 
+    $scripts->add( 'customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array( 'jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu', 'wp-a11y' ), false, 1 );
+    $scripts->add( 'customize-preview-nav-menus', "/wp-includes/js/customize-preview-nav-menus$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
+
     $scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 );
 
@@ -657 +660 @@
 
     // Admin CSS
-    $styles->add( 'wp-admin',           "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
-    $styles->add( 'login',              "/wp-admin/css/login$suffix.css", array( 'buttons', 'open-sans', 'dashicons' ) );
-    $styles->add( 'install',            "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );
-    $styles->add( 'wp-color-picker',    "/wp-admin/css/color-picker$suffix.css" );
-    $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
-    $styles->add( 'customize-widgets',  "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
-    $styles->add( 'press-this',         "/wp-admin/css/press-this$suffix.css", array( 'open-sans', 'buttons' ) );
-
-    $styles->add( 'ie',                 "/wp-admin/css/ie$suffix.css" );
+    $styles->add( 'wp-admin',            "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
+    $styles->add( 'login',               "/wp-admin/css/login$suffix.css", array( 'buttons', 'open-sans', 'dashicons' ) );
+    $styles->add( 'install',             "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );
+    $styles->add( 'wp-color-picker',     "/wp-admin/css/color-picker$suffix.css" );
+    $styles->add( 'customize-controls',  "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
+    $styles->add( 'customize-widgets',   "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
+    $styles->add( 'customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array( 'wp-admin', 'colors' ) );
+    $styles->add( 'press-this',          "/wp-admin/css/press-this$suffix.css", array( 'open-sans', 'buttons' ) );
+
+    $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
     $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
 
@@ -674 +678 @@
 
     // Includes CSS
-    $styles->add( 'admin-bar',      "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) );
-    $styles->add( 'wp-auth-check',  "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
-    $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
-    $styles->add( 'media-views',    "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
-    $styles->add( 'wp-pointer',     "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
+    $styles->add( 'admin-bar',         "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) );
+    $styles->add( 'wp-auth-check',     "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
+    $styles->add( 'editor-buttons',    "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
+    $styles->add( 'media-views',       "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
+    $styles->add( 'wp-pointer',        "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
+    $styles->add( 'customize-preview', "/wp-includes/css/customize-preview$suffix.css" );
 
     // External libraries and friends
@@ -696 +701 @@
     $rtl_styles = array(
         // wp-admin
-        'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'ie', 'login', 'press-this',
+        'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'ie', 'login', 'press-this',
         // wp-includes
         'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',