<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[30306] trunk/src: Customizer: When navigating around the site within the Customizer preview, update the document title.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30306">30306</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30306","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-11 22:28:38 +0000 (Tue, 11 Nov 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customizer: When navigating around the site within the Customizer preview, update the document title.
props westonruter.
fixes <a href="https://core.trac.wordpress.org/ticket/28542">#28542</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesjscustomizeloaderjs">trunk/src/wp-includes/js/customize-loader.js</a></li>
<li><a href="#trunksrcwpincludesjscustomizepreviewjs">trunk/src/wp-includes/js/customize-preview.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincustomizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/customize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/customize.php 2014-11-11 19:35:40 UTC (rev 30305)
+++ trunk/src/wp-admin/customize.php 2014-11-11 22:28:38 UTC (rev 30306)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,14 +76,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_ios = wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $is_ios )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $is_ios ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $body_class .= ' ios';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_rtl() )
- $body_class .= ' rtl';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( is_rtl() ) {
+ $body_class .= ' rtl';
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$admin_title = sprintf( __( '%1$s — WordPress' ), strip_tags( sprintf( __( 'Customize %s' ), $wp_customize->theme()->display('Name') ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+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…' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ?><title><?php echo $admin_title; ?></title>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,6 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'preview' => wp_create_nonce( 'preview-customize_' . $wp_customize->get_stylesheet() )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'autofocus' => array(),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'documentTitleTmpl' => $document_title_tmpl,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare Customize Setting objects to pass to Javascript.
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2014-11-11 19:35:40 UTC (rev 30305)
+++ trunk/src/wp-admin/js/customize-controls.js 2014-11-11 22:28:38 UTC (rev 30306)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1500,6 +1500,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }());
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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;
+ }
+ };
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @constructor
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Messenger
</span><span class="cx" style="display: block; padding: 0 10px"> * @augments wp.customize.Class
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1617,6 +1632,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the URL when the iframe sends a URL message.
</span><span class="cx" style="display: block; padding: 0 10px"> this.bind( 'url', this.previewUrl );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Update the document title when the preview changes
+ this.bind( 'documentTitle', function ( title ) {
+ api.setDocumentTitle( title );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> query: function() {},
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizeloaderjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/customize-loader.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/customize-loader.js 2014-11-11 19:35:40 UTC (rev 30305)
+++ trunk/src/wp-includes/js/customize-loader.js 2014-11-11 22:28:38 UTC (rev 30306)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Loader.open( Loader.settings.url + '?' + hash );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! hash && ! $.support.history ){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! hash && ! $.support.history ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> Loader.close();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +105,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return window.location = src;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Store the document title prior to opening the Live Preview
+ this.originalDocumentTitle = document.title;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.active = true;
</span><span class="cx" style="display: block; padding: 0 10px"> this.body.addClass('customize-loading');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> Loader.close();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prompt AYS dialog when navigating away
</span><span class="cx" style="display: block; padding: 0 10px"> $( window ).on( 'beforeunload', this.beforeunload );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,15 +161,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> pushState: function ( src ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var hash;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var hash = src.split( '?' )[1];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure we don't call pushState if the user hit the forward button.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $.support.history && window.location.href !== src ) {
</span><span class="cx" style="display: block; padding: 0 10px"> history.pushState( { customize: src }, '', src );
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( ! $.support.history && $.support.hashchange && hash ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- hash = src.split( '?' )[1];
</del><span class="cx" style="display: block; padding: 0 10px"> window.location.hash = 'wp_customize=on&' + hash;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ this.trigger( 'open' );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,6 +199,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'close' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Restore document title prior to opening the Live Preview
+ if ( this.originalDocumentTitle ) {
+ document.title = this.originalDocumentTitle;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Return focus to link that was originally clicked.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.link.focus();
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizepreviewjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/customize-preview.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/customize-preview.js 2014-11-11 19:35:40 UTC (rev 30305)
+++ trunk/src/wp-includes/js/customize-preview.js 2014-11-11 22:28:38 UTC (rev 30306)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,11 +101,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> preview.send( 'synced' );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preview.bind( 'active', function() {
- if ( api.settings.nonce )
- preview.send( 'nonce', api.settings.nonce );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preview.bind( 'active', function() {
+ if ( api.settings.nonce ) {
+ preview.send( 'nonce', api.settings.nonce );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preview.send( 'documentTitle', document.title );
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> preview.send( 'ready', {
</span><span class="cx" style="display: block; padding: 0 10px"> activePanels: api.settings.activePanels,
</span><span class="cx" style="display: block; padding: 0 10px"> activeSections: api.settings.activeSections,
</span></span></pre>
</div>
</div>
</body>
</html>