Merge 0846554 into 629033d

.travis.yml

@@ -12,7 +12,9 @@ node_js:
     - stable
 
 env:
+    - WP_VERSION=trunk WP_MULTISITE=0
     - WP_VERSION=latest WP_MULTISITE=0
+    - WP_VERSION=4.6.1 WP_MULTISITE=0
     - WP_VERSION=latest WP_MULTISITE=1
 
 install:

css/customize-snapshots.css

@@ -9,6 +9,7 @@
 #snapshot-expand-button {
 	display: block;
 }
+
 #snapshot-expand-button:hover,
 #snapshot-expand-button:focus,
 #snapshot-expand-button:active {
@@ -72,8 +73,8 @@
 	top: 46px;
 	position: absolute;
 	width: 100%;
-	box-shadow: 0 5px 0 0 rgba(0,0,0,0.05);
-	padding:10px;
+	box-shadow: 0 5px 0 0 rgba(0, 0, 0, 0.05);
+	padding: 10px;
 	box-sizing: border-box;
 }
 
@@ -89,6 +90,7 @@
 	margin-bottom: 0.5em;
 	margin-top: 0;
 }
+
 #customize-snapshot .timezone-info {
 	margin-top: 0.5em;
 	font-size: smaller;
@@ -169,13 +171,13 @@
 	min-width: 4em;
 }
 
-.snapshot-schedule-control input[type="number"]{
-	width:100%;
+.snapshot-schedule-control input[type="number"] {
+	width: 100%;
 }
 
 .snapshot-schedule-control .time-special-char {
-	padding-left:2px;
-	padding-right:2px;
+	padding-left: 2px;
+	padding-right: 2px;
 }
 
 .snapshot-schedule-control select {
@@ -203,17 +205,137 @@
 	z-index: 500100 !important;
 }
 
-.snapshot-control input[type="text"]{
+.snapshot-control input[type="text"] {
 	width: 100%;
 	line-height: 18px;
 	margin: 0;
 }
 
-#customize-snapshot .snapshot-schedule-title h3{
+#customize-snapshot .snapshot-schedule-title h3 {
 	font-size: 16px;
 }
 
-#customize-snapshot .snapshot-controls{
+#customize-snapshot .snapshot-controls {
 	list-style: none;
 	margin: 0;
-}
+}
+
+.snapshot-future-date-notification.notice {
+	margin-bottom: 5px;
+	border-top: 1px solid #eee;
+	padding: 5px;
+}
+
+/*Status Button*/
+/** @todo Need to add snapshot specific class for all ui classes. **/
+
+#snapshot-status-button-wrapper {
+	float: right;
+	position: relative;
+	margin-top: 9px;
+	height: 28px;
+}
+
+#snapshot-status-button-wrapper .button-primary {
+	margin-top: 0;
+	-webkit-touch-callout: none; /* iOS Safari */
+	-webkit-user-select: none; /* Chrome/Safari/Opera */
+	-moz-user-select: none; /* Firefox */
+	-ms-user-select: none; /* Internet Explorer/Edge */
+	user-select: none;
+}
+
+.ui-selectmenu-menu {
+	padding: 0;
+	margin: 0;
+	position: absolute;
+	top: 0;
+	left: 0;
+	display: none;
+}
+
+.ui-selectmenu-menu .ui-menu {
+	overflow: auto;
+	margin: 0;
+	margin-top: 2px;
+	overflow-x: hidden;
+	background: #FFFFFF;
+	border-top: 0;
+	border-radius: 0 0 5px 5px;
+	box-shadow: 0 1px 4px 0 rgba(33, 38, 34, .12), 0 2px 11px 0 rgba(30, 36, 37, .14)
+}
+
+.ui-selectmenu-menu .ui-menu li {
+	padding: 5px 10px 5px 5px;
+	margin: 0;
+}
+
+.ui-selectmenu-menu .ui-menu .ui-state-focus {
+	background: #0073aa;
+	color: #FFFFFF;
+	cursor: pointer;
+}
+
+.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
+	font-size: 1em;
+	font-weight: bold;
+	line-height: 1.5;
+	padding: 2px 0.4em;
+	margin: 0.5em 0 0 0;
+	height: auto;
+	border: 0;
+}
+
+.ui-selectmenu-open {
+	display: block;
+}
+
+#snapshot-status-button-wrapper .ui-selectmenu-button span.dashicons {
+	text-indent: 0;
+	float: right;
+	border-radius: 0 3px 3px 0;
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+	font-size: 20px;
+	width: 20px;
+}
+
+#snapshot-status-button-wrapper .ui-selectmenu-button span.dashicons:before {
+	display: inline-block;
+	margin-left: -3px;
+}
+
+@media screen and ( max-width: 640px ) {
+	#snapshot-status-button-wrapper .ui-selectmenu-button span.dashicons {
+		font-size: 17px;
+	}
+}
+
+.ui-selectmenu-button span.ui-selectmenu-text {
+	border-radius: 3px 0 0 3px;
+	opacity: 0;
+}
+
+.ui-selectmenu-menu.ui-front {
+	z-index: 999999;
+}
+
+.snapshot-status-button-overlay.button {
+	width: calc( 100% - 20px );
+	height: 28px;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1;
+	border-radius: 3px 0 0 3px;
+	box-shadow: none;
+}
+
+#customize-header-actions .ui-selectmenu-button {
+	display: inline-block;
+	outline-width: 2px;
+	outline-offset: -2px;
+}

instance.php

@@ -33,7 +33,12 @@ function get_plugin_instance() {
  * @return bool Whether previewing settings.
  */
 function is_previewing_settings() {
-	return get_plugin_instance()->customize_snapshot_manager->is_previewing_settings();
+	$manager = get_plugin_instance()->customize_snapshot_manager;
+	if ( get_plugin_instance()->compat ) {
+		return $manager->is_previewing_settings();
+	} else {
+		return isset( $manager->customize_manager ) && $manager->customize_manager->is_preview();
+	}
 }
 
 /**
@@ -51,3 +56,19 @@ function current_snapshot_uuid() {
 		return $customize_snapshot_uuid;
 	}
 }
+
+/**
+ * Returns whether it is back compat or not.
+ *
+ * @return bool is compat.
+ */
+function is_back_compat() {
+	$wp_version = get_bloginfo( 'version' );
+
+	// Fix in case version contains extra string for example 4.7-src in that case php version_compare fails.
+	$pos = strpos( $wp_version, '-' );
+	if ( false !== $pos ) {
+		$wp_version = substr( $wp_version, 0, $pos );
+	}
+	return version_compare( $wp_version, '4.7', '<' );
+}

js/customize-snapshots-preview.js → js/compat/customize-snapshots-preview.js

@@ -194,7 +194,7 @@ var CustomizeSnapshotsPreview = (function( api, $ ) {
 
 			// Now preventDefault as is done on the normal submit.preview handler in customize-preview.js.
 			event.preventDefault();
-		});
+		} );
 	};
 
 	return component;