Merge branch 'develop' of https://github.com/xwp/wp-customize-snapshots into bugfix/saving-menus-issue_2

westonruter · westonruter · commit 310b36539d78 · 2016-07-04T22:05:39.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -16,10 +16,6 @@ env:
     - WP_VERSION=trunk WP_MULTISITE=1
     - WP_VERSION=latest WP_MULTISITE=1
 
-branches:
-    only:
-        - master
-
 install:
     - export DEV_LIB_PATH=dev-lib
     - if [ ! -e "$DEV_LIB_PATH" ] && [ -L .travis.yml ]; then export DEV_LIB_PATH=$( dirname $( readlink .travis.yml ) ); fi
diff --git a/dev-lib b/dev-lib
@@ -1 +1 @@
-Subproject commit 0f3058b380a75ffabfbc3ba550e9422a3227b174
+Subproject commit 30b4b229691a9f4b006ded13c738a06961085887
diff --git a/php/class-customize-snapshot-manager.php b/php/class-customize-snapshot-manager.php
@@ -1002,11 +1002,44 @@ public function get_snapshot_uuid() {
 	}
 
 	/**
-	 * Replaces the "Customize" link in the Toolbar.
+	 * Toolbar modifications for Customize Snapshot
 	 *
 	 * @param \WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
 	 */
 	public function customize_menu( $wp_admin_bar ) {
+
+		$this->replace_customize_link( $wp_admin_bar );
+		$this->add_post_edit_screen_link( $wp_admin_bar );
+
+		add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+	}
+
+	/**
+	 * Adds a "Snapshot in Dashboard" link to the Toolbar when in Snapshot mode.
+	 *
+	 * @param \WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
+	 */
+	public function add_post_edit_screen_link( $wp_admin_bar ) {
+		$snapshot_post = $this->snapshot->post();
+		if ( ! $snapshot_post ) {
+			return;
+		}
+
+		$wp_admin_bar->add_node( array(
+			'parent' => 'customize',
+			'id' => 'snapshot-view-link',
+			'title' => __( 'View Snapshot', 'customize-snapshots' ),
+			'href' => get_edit_post_link( $snapshot_post->ID ),
+		) );
+	}
+
+	/**
+	 * Replaces the "Customize" link in the Toolbar.
+	 *
+	 * @param \WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
+	 */
+	public function replace_customize_link( $wp_admin_bar ) {
+
 		// Don't show for users who can't access the customizer or when in the admin.
 		if ( ! current_user_can( 'customize' ) || is_admin() ) {
 			return;
@@ -1032,7 +1065,6 @@ public function customize_menu( $wp_admin_bar ) {
 				),
 			)
 		);
-		add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
 	}
 
 	/**
diff --git a/tests/php/test-class-customize-snapshot-manager.php b/tests/php/test-class-customize-snapshot-manager.php
@@ -166,19 +166,16 @@ function test_clean_current_url() {
 	}
 
 	/**
+	 * Test Customize_Snapshot_Manager::create_post_type().
+	 *
 	 * @see Customize_Snapshot_Manager::create_post_type()
 	 */
 	function test_create_post_type() {
-		global $wp_version;
 		$pobj = get_post_type_object( Customize_Snapshot_Manager::POST_TYPE );
-		if ( version_compare( $wp_version, '4.6-alpha', '>=' ) && is_multisite() ) {
-			$this->assertInstanceOf( 'WP_Post_Type', $pobj );
-		} else {
-			$this->assertInstanceOf( 'stdClass', $pobj );
-		}
+		$this->assertNotNull( $pobj );
 		$this->assertEquals( Customize_Snapshot_Manager::POST_TYPE, $pobj->name );
 
-		// Test some defaults
+		// Test some defaults.
 		$this->assertFalse( is_post_type_hierarchical( Customize_Snapshot_Manager::POST_TYPE ) );
 		$this->assertEquals( array(), get_object_taxonomies( Customize_Snapshot_Manager::POST_TYPE ) );
 	}
