<!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>[20488] trunk/wp-includes: Theme Customizer: Integrate with browser history.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20488">20488</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-04-16 23:07:23 +0000 (Mon, 16 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Integrate with browser history. Use window.history by default, with window.onhashchange as a fallback. fixes <a href="http://core.trac.wordpress.org/ticket/20337">#20337</a>, see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjscustomizeloaderdevjs">trunk/wp-includes/js/customize-loader.dev.js</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjscustomizeloaderdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-loader.dev.js (20487 => 20488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-loader.dev.js 2012-04-16 22:46:36 UTC (rev 20487)
+++ trunk/wp-includes/js/customize-loader.dev.js 2012-04-16 23:07:23 UTC (rev 20488)
</span><span class="lines">@@ -6,9 +6,15 @@
</span><span class="cx"> Loader;
</span><span class="cx">
</span><span class="cx"> Loader = {
</span><ins>+ supports: {
+ history: !! ( window.history && history.pushState ),
+ hashchange: ('onhashchange' in window) && (document.documentMode === undefined || document.documentMode > 7)
+ },
+
</ins><span class="cx"> initialize: function() {
</span><del>- this.body = $( document.body ).addClass('customize-support');
- this.element = $( '<div id="customize-container" class="wp-full-overlay" />' ).appendTo( this.body );
</del><ins>+ this.body = $( document.body ).addClass('customize-support');
+ this.window = $( window );
+ this.element = $( '<div id="customize-container" class="wp-full-overlay" />' ).appendTo( this.body );
</ins><span class="cx">
</span><span class="cx"> $('#wpbody').on( 'click', '.load-customize', function( event ) {
</span><span class="cx"> event.preventDefault();
</span><span class="lines">@@ -16,8 +22,35 @@
</span><span class="cx"> // Load the theme.
</span><span class="cx"> Loader.open( $(this).attr('href') );
</span><span class="cx"> });
</span><ins>+
+ // Add navigation listeners.
+ if ( this.supports.history )
+ this.window.on( 'popstate', Loader.popstate );
+
+ if ( this.supports.hashchange )
+ this.window.on( 'hashchange', Loader.hashchange );
</ins><span class="cx"> },
</span><ins>+ popstate: function( e ) {
+ var state = e.originalEvent.state;
+ if ( state && state.customize )
+ Loader.open( state.customize );
+ else if ( Loader.active )
+ Loader.close();
+ },
+ hashchange: function( e ) {
+ var hash = window.location.toString().split('#')[1];
+
+ if ( hash && 0 === hash.indexOf( 'customize=on' ) )
+ Loader.open( wpCustomizeLoaderL10n.url + '?' + hash );
+
+ if ( ! hash )
+ Loader.close();
+ },
</ins><span class="cx"> open: function( src ) {
</span><ins>+ if ( this.active )
+ return;
+ this.active = true;
+
</ins><span class="cx"> this.iframe = $( '<iframe />', { src: src }).appendTo( this.element );
</span><span class="cx">
</span><span class="cx"> // Create a postMessage connection with the iframe.
</span><span class="lines">@@ -29,14 +62,31 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.messenger.bind( 'close', function() {
</span><del>- Loader.close();
</del><ins>+ if ( Loader.supports.history )
+ history.back();
+ else if ( Loader.supports.hashchange )
+ window.location.hash = '';
+ else
+ Loader.close();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.element.fadeIn( 200, function() {
</span><ins>+ var hash = src.split('?')[1];
+
</ins><span class="cx"> Loader.body.addClass( 'customize-active full-overlay-active' );
</span><ins>+
+ // Ensure we don't call pushState if the user hit the forward button.
+ if ( Loader.supports.history && window.location.href !== src )
+ history.pushState( { customize: src }, '', src );
+ else if ( Loader.supports.hashchange && hash )
+ window.location.hash = hash;
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx"> close: function() {
</span><ins>+ if ( ! this.active )
+ return;
+ this.active = false;
+
</ins><span class="cx"> this.element.fadeOut( 200, function() {
</span><span class="cx"> Loader.iframe.remove();
</span><span class="cx"> Loader.iframe = null;
</span><span class="lines">@@ -47,7 +97,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> $( function() {
</span><del>- if ( !! window.postMessage )
</del><ins>+ if ( window.postMessage )
</ins><span class="cx"> Loader.initialize();
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (20487 => 20488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-04-16 22:46:36 UTC (rev 20487)
+++ trunk/wp-includes/theme.php 2012-04-16 23:07:23 UTC (rev 20488)
</span><span class="lines">@@ -1590,6 +1590,7 @@
</span><span class="cx"> function _wp_customize_loader_localize() {
</span><span class="cx"> wp_localize_script( 'customize-loader', 'wpCustomizeLoaderL10n', array(
</span><span class="cx"> 'back' => sprintf( __( '&larr; Return to %s' ), get_admin_page_title() ),
</span><ins>+ 'url' => admin_url( 'admin.php' ),
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_enqueue_scripts', '_wp_customize_loader_localize' );
</span></span></pre>
</div>
</div>
</body>
</html>