Support Customize Menus

php/class-customize-snapshot-manager.php

@@ -155,8 +155,46 @@ public function __construct( Plugin $plugin ) {
 			}
 		}
 
+		/*
+		 * Add WP_Customize_Nav_Menu component hooks which were short-circuited in 4.5 (r36611 for #35895).
+		 * See https://core.trac.wordpress.org/ticket/35895
+		 */
+		if ( isset( $this->customize_manager->nav_menus ) && ! current_user_can( 'edit_theme_options' ) ) {
+			$hooks = array(
+				'customize_register' => array(
+					'callback' => array( $this->customize_manager->nav_menus, 'customize_register' ),
+					'priority' => 11,
+				),
+				'customize_dynamic_setting_args' => array(
+					'callback' => array( $this->customize_manager->nav_menus, 'filter_dynamic_setting_args' ),
+					'priority' => 10,
+				),
+				'customize_dynamic_setting_class' => array(
+					'callback' => array( $this->customize_manager->nav_menus, 'filter_dynamic_setting_class' ),
+					'priority' => 10,
+				),
+				'wp_nav_menu_args' => array(
+					'callback' => array( $this->customize_manager->nav_menus, 'filter_wp_nav_menu_args' ),
+					'priority' => 1000,
+				),
+				'wp_nav_menu' => array(
+					'callback' => array( $this->customize_manager->nav_menus, 'filter_wp_nav_menu' ),
+					'priority' => 10,
+				),
+			);
+			foreach ( $hooks as $hook_name => $hook_args ) {
+				// Note that add_action()/has_action() are just aliases for add_filter()/has_filter().
+				if ( ! has_filter( $hook_name, $hook_args['callback'] ) ) {
+					add_filter( $hook_name, $hook_args['callback'], $hook_args['priority'], PHP_INT_MAX );
+				}
+			}
+		}
+
 		// Preview a Snapshot.
 		add_action( 'after_setup_theme', array( $this, 'set_post_values' ), 1 );
+		if ( isset( $this->customize_manager->nav_menus ) ) {
+			add_action( 'customize_register', array( $this, 'preview_early_nav_menus_in_customizer' ), 9 );
+		}
 		add_action( 'wp_loaded', array( $this, 'preview' ) );
 
 		/*
@@ -917,4 +955,33 @@ public function preview() {
 			}
 		}
 	}
+
+	/**
+	 * Preview nav menu settings early so that the sections and controls for snapshot values will be added properly.
+	 *
+	 * This must happen at `customize_register` priority prior to 11 which is when `WP_Customize_Nav_Menus::customize_register()` runs.
+	 * This is only relevant when accessing the Customizer app (customize.php), as this is where sections/controls matter.
+	 *
+	 * @see \WP_Customize_Nav_Menus::customize_register()
+	 */
+	public function preview_early_nav_menus_in_customizer() {
+		if ( ! is_admin() ) {
+			return;
+		}
+
+		$this->customize_manager->add_dynamic_settings( array_keys( $this->snapshot()->data() ) );
+		foreach ( $this->snapshot->settings() as $setting ) {
+			$is_nav_menu_setting = (
+				$setting instanceof \WP_Customize_Nav_Menu_Setting
+				||
+				$setting instanceof \WP_Customize_Nav_Menu_Item_Setting
+				||
+				preg_match( '/^nav_menu_locations\[/', $setting->id )
+			);
+			if ( $is_nav_menu_setting ) {
+				$setting->preview();
+				$setting->dirty = true;
+			}
+		}
+	}
 }

readme.md

@@ -6,12 +6,12 @@ Allow Customizer states to be drafted, and previewed with a private URL.
 
 **Contributors:** [westonruter](https://profiles.wordpress.org/westonruter), [valendesigns](https://profiles.wordpress.org/valendesigns), [xwp](https://profiles.wordpress.org/xwp), [newscorpau](https://profiles.wordpress.org/newscorpau)  
 **Tags:** [customizer](https://wordpress.org/plugins/tags/customizer), [customize](https://wordpress.org/plugins/tags/customize), [snapshots](https://wordpress.org/plugins/tags/snapshots)  
-**Requires at least:** 4.5  
+**Requires at least:** 4.6-beta2  
 **Tested up to:** trunk  
 **Stable tag:** 0.4.0  
 **License:** [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)  
 
-[![Build Status](https://travis-ci.org/xwp/wp-customize-snapshots.svg?branch=master)](https://travis-ci.org/xwp/wp-customize-snapshots) [![Coverage Status](https://coveralls.io/repos/xwp/wp-customize-snapshots/badge.svg?branch=master)](https://coveralls.io/github/xwp/wp-customize-snapshots) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com) [![devDependency Status](https://david-dm.org/xwp/wp-customize-snapshots/dev-status.svg)](https://david-dm.org/xwp/wp-customize-snapshots#info=devDependencies) 
+[![Build Status](https://travis-ci.org/xwp/wp-customize-snapshots.svg?branch=master)](https://travis-ci.org/xwp/wp-customize-snapshots) [![Coverage Status](https://coveralls.io/repos/xwp/wp-customize-snapshots/badge.svg?branch=master)](https://coveralls.io/github/xwp/wp-customize-snapshots) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com) [![devDependency Status](https://david-dm.org/xwp/wp-customize-snapshots/dev-status.svg)](https://david-dm.org/xwp/wp-customize-snapshots#info=devDependencies) 
 
 ## Description ##
 

readme.txt

@@ -1,6 +1,6 @@
 === Customize Snapshots ===
 Contributors: westonruter, valendesigns, xwp, newscorpau
-Requires at least: 4.5
+Requires at least: 4.6-beta2
 Tested up to: trunk
 Stable tag: 0.4.0
 License: GPLv2 or later

tests/php/test-class-customize-snapshot-manager.php

@@ -163,9 +163,9 @@ function test_clean_current_url() {
 	 * @see Customize_Snapshot_Manager::create_post_type()
 	 */
 	function test_create_post_type() {
-		$pobj = get_post_type_object( Customize_Snapshot_Manager::POST_TYPE );
-		$this->assertNotNull( $pobj );
-		$this->assertEquals( Customize_Snapshot_Manager::POST_TYPE, $pobj->name );
+		$post_type_object = get_post_type_object( Customize_Snapshot_Manager::POST_TYPE );
+		$this->assertNotNull( $post_type_object );
+		$this->assertEquals( Customize_Snapshot_Manager::POST_TYPE, $post_type_object->name );
 
 		// Test some defaults.
 		$this->assertFalse( is_post_type_hierarchical( Customize_Snapshot_Manager::POST_TYPE ) );