X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..b22765f41bf0b2021b9beb9120ee0ac91fa89292:/wp-includes/js/customize-loader.js

diff --git a/wp-includes/js/customize-loader.js b/wp-includes/js/customize-loader.js
index 2ee0c0f9..e7b411df 100644
--- a/wp-includes/js/customize-loader.js
+++ b/wp-includes/js/customize-loader.js
@@ -1,4 +1,8 @@
 /* global _wpCustomizeLoaderSettings, confirm */
+/*
+ * Expose a public API that allows the customizer to be
+ * loaded on any page.
+ */
 window.wp = window.wp || {};
 
 (function( exports, $ ){
@@ -14,9 +18,9 @@ window.wp = window.wp || {};
 	 * Allows the Customizer to be overlayed on any page.
 	 *
 	 * By default, any element in the body with the load-customize class will open
-	 * the Customizer overlay with the URL specified.
+	 * an iframe overlay with the URL specified.
 	 *
-	 *     e.g. <a class="load-customize" href="http://siteurl.com/2014/01/02/post">Open customizer</a>
+	 *     e.g. <a class="load-customize" href="<?php echo wp_customize_url(); ?>">Open Customizer</a>
 	 *
 	 * @augments wp.customize.Events
 	 */
@@ -45,7 +49,7 @@ window.wp = window.wp || {};
 			$('#wpbody').on( 'click', '.load-customize', function( event ) {
 				event.preventDefault();
 
-				// Store a reference to the link that opened the customizer.
+				// Store a reference to the link that opened the Customizer.
 				Loader.link = $(this);
 				// Load the theme.
 				Loader.open( Loader.link.attr('href') );
@@ -78,7 +82,7 @@ window.wp = window.wp || {};
 				Loader.open( Loader.settings.url + '?' + hash );
 			}
 
-			if ( ! hash && ! $.support.history ){
+			if ( ! hash && ! $.support.history ) {
 				Loader.close();
 			}
 		},
@@ -90,7 +94,7 @@ window.wp = window.wp || {};
 		},
 
 		/**
-		 * Open the customizer overlay for a specific URL.
+		 * Open the Customizer overlay for a specific URL.
 		 *
 		 * @param  string src URL to load in the Customizer.
 		 */
@@ -105,13 +109,20 @@ window.wp = window.wp || {};
 				return window.location = src;
 			}
 
+			// Store the document title prior to opening the Live Preview
+			this.originalDocumentTitle = document.title;
+
 			this.active = true;
 			this.body.addClass('customize-loading');
 
-			// Dirty state of customizer in iframe
+			/*
+			 * Track the dirtiness state (whether the drafted changes have been published)
+			 * of the Customizer in the iframe. This is used to decide whether to display
+			 * an AYS alert if the user tries to close the window before saving changes.
+			 */
 			this.saved = new api.Value( true );
 
-			this.iframe = $( '<iframe />', { src: src }).appendTo( this.element );
+			this.iframe = $( '<iframe />', { 'src': src, 'title': Loader.settings.l10n.mainIframeTitle } ).appendTo( this.element );
 			this.iframe.one( 'load', this.loaded );
 
 			// Create a postMessage connection with the iframe.
@@ -134,17 +145,11 @@ window.wp = window.wp || {};
 				} else {
 					Loader.close();
 				}
-			} );
+			});
 
 			// Prompt AYS dialog when navigating away
 			$( window ).on( 'beforeunload', this.beforeunload );
 
-			this.messenger.bind( 'activated', function( location ) {
-				if ( location ) {
-					window.location = location;
-				}
-			});
-
 			this.messenger.bind( 'saved', function () {
 				Loader.saved( true );
 			} );
@@ -152,25 +157,30 @@ window.wp = window.wp || {};
 				Loader.saved( false );
 			} );
 
+			this.messenger.bind( 'title', function( newTitle ){
+				window.document.title = newTitle;
+			});
+
 			this.pushState( src );
 
 			this.trigger( 'open' );
 		},
 
 		pushState: function ( src ) {
-			var hash;
+			var hash = src.split( '?' )[1];
 
 			// Ensure we don't call pushState if the user hit the forward button.
 			if ( $.support.history && window.location.href !== src ) {
 				history.pushState( { customize: src }, '', src );
 			} else if ( ! $.support.history && $.support.hashchange && hash ) {
-				hash = src.split( '?' )[1];
 				window.location.hash = 'wp_customize=on&' + hash;
 			}
+
+			this.trigger( 'open' );
 		},
 
 		/**
-		 * Callback after the customizer has been opened.
+		 * Callback after the Customizer has been opened.
 		 */
 		opened: function() {
 			Loader.body.addClass( 'customize-active full-overlay-active' );
@@ -184,7 +194,7 @@ window.wp = window.wp || {};
 				return;
 			}
 
-			// Display AYS dialog if customizer is dirty
+			// Display AYS dialog if Customizer is dirty
 			if ( ! this.saved() && ! confirm( Loader.settings.l10n.saveAlert ) ) {
 				// Go forward since Customizer is exited by history.back()
 				history.forward();
@@ -195,6 +205,11 @@ window.wp = window.wp || {};
 
 			this.trigger( 'close' );
 
+			// Restore document title prior to opening the Live Preview
+			if ( this.originalDocumentTitle ) {
+				document.title = this.originalDocumentTitle;
+			}
+
 			// Return focus to link that was originally clicked.
 			if ( this.link ) {
 				this.link.focus();
@@ -202,7 +217,7 @@ window.wp = window.wp || {};
 		},
 
 		/**
-		 * Callback after the customizer has been closed.
+		 * Callback after the Customizer has been closed.
 		 */
 		closed: function() {
 			Loader.iframe.remove();