Ticket #28542: 28542.2.diff

src/wp-admin/customize.php

@@ -78 +78 @@
 
 $is_ios = wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
 
-if ( $is_ios )
+if ( $is_ios ) {
         $body_class .= ' ios';
+}
 
-if ( is_rtl() )
-        $body_class .=  ' rtl';
+if ( is_rtl() ) {
+        $body_class .= ' rtl';
+}
 $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
-$admin_title = sprintf( __( '%1$s — WordPress' ), strip_tags( sprintf( __( 'Customize %s' ), $wp_customize->theme()->display('Name') ) ) );
+if ( $wp_customize->is_theme_active() ) {
+        $document_title_tmpl = _x( 'Customize: %s', 'Placeholder is the document title from the preview' );
+} else {
+        $document_title_tmpl = _x( 'Live Preview: %s', 'Placeholder is the document title from the preview' );
+}
+$document_title_tmpl = html_entity_decode( $document_title_tmpl, ENT_QUOTES, 'UTF-8' ); // because exported to JS and assigned to document.title
+$admin_title = sprintf( $document_title_tmpl, __( 'Loading…' ) );
+
 ?><title><?php echo $admin_title; ?></title>
 
 <script type="text/javascript">
@@ -253 +262 @@
                         'save'    => wp_create_nonce( 'save-customize_' . $wp_customize->get_stylesheet() ),
                         'preview' => wp_create_nonce( 'preview-customize_' . $wp_customize->get_stylesheet() )
                 ),
+                'documentTitleTmpl' => $document_title_tmpl,
         );
 
         // Prepare Customize Setting objects to pass to Javascript.

src/wp-admin/js/customize-controls.js

@@ -763 +763 @@
         }());
 
         /**
+         * Set the document title of the customizer
+         *
+         * @param {string} documentTitle
+         */
+        api.setDocumentTitle = function ( documentTitle ) {
+                var tmpl, title;
+                tmpl = api.settings.documentTitleTmpl;
+                title = tmpl.replace( '%s', documentTitle );
+                document.title = title;
+                if ( window !== window.parent ) {
+                        window.parent.document.title = document.title;
+                }
+        };
+
+        /**
          * @constructor
          * @augments wp.customize.Messenger
          * @augments wp.customize.Class
@@ -877 +892 @@
 
                         // Update the URL when the iframe sends a URL message.
                         this.bind( 'url', this.previewUrl );
+
+                        // Update the document title when the preview changes
+                        this.bind( 'documentTitle', function ( title ) {
+                                api.setDocumentTitle( title );
+                        } );
                 },
 
                 query: function() {},

src/wp-includes/js/customize-loader.js

@@ -78 +78 @@
                                 Loader.open( Loader.settings.url + '?' + hash );
                         }
 
-                        if ( ! hash && ! $.support.history ){
+                        if ( ! hash && ! $.support.history ) {
                                 Loader.close();
                         }
                 },
@@ -105 +105 @@
                                 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');
 
@@ -134 +137 @@
                                 } else {
                                         Loader.close();
                                 }
-                        } );
+                        });
 
                         // Prompt AYS dialog when navigating away
                         $( window ).on( 'beforeunload', this.beforeunload );
@@ -158 +161 @@
                 },
 
                 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' );
                 },
 
                 /**
@@ -195 +199 @@
 
                         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();

src/wp-includes/js/customize-preview.js

@@ -101 +101 @@
                         preview.send( 'synced' );
                 });
 
-        preview.bind( 'active', function() {
-            if ( api.settings.nonce )
-                preview.send( 'nonce', api.settings.nonce );
-        });
+                preview.bind( 'active', function() {
+                        if ( api.settings.nonce ) {
+                                preview.send( 'nonce', api.settings.nonce );
+                        }
+
+                        preview.send( 'documentTitle', document.title );
+                });
 
                 preview.send( 'ready', {
                         activeControls: api.settings.activeControls