<!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>[21029] trunk: Customizer: fix stuck urls and preview white screens after repeated save and activates.</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/21029">21029</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-06-08 18:52:44 +0000 (Fri, 08 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Customizer: fix stuck urls and preview white screens after repeated save and activates. Props koopersmith. fixes <a href="http://core.trac.wordpress.org/ticket/20868">#20868</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjscustomizecontrolsdevjs">trunk/wp-admin/js/customize-controls.dev.js</a></li>
<li><a href="#trunkwpincludesjscustomizebasedevjs">trunk/wp-includes/js/customize-base.dev.js</a></li>
<li><a href="#trunkwpincludesjscustomizeloaderdevjs">trunk/wp-includes/js/customize-loader.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/customize-controls.dev.js (21028 => 21029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/customize-controls.dev.js 2012-06-08 18:45:12 UTC (rev 21028)
+++ trunk/wp-admin/js/customize-controls.dev.js 2012-06-08 18:52:44 UTC (rev 21029)
</span><span class="lines">@@ -694,11 +694,6 @@
</span><span class="cx"> api.state = state;
</span><span class="cx"> }());
</span><span class="cx">
</span><del>- api.bind( 'activated', function() {
- if ( api.settings.url.activated )
- window.location = api.settings.url.activated;
- });
-
</del><span class="cx"> // Temporary accordion code.
</span><span class="cx"> $('.customize-section-title').click( function( event ) {
</span><span class="cx"> var clicked = $( this ).parents( '.customize-section' );
</span><span class="lines">@@ -738,12 +733,19 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Pass events through to the parent.
</span><del>- $.each([ 'saved', 'activated' ], function( i, id ) {
- api.bind( id, function() {
- parent.send( id );
- });
</del><ins>+ api.bind( 'saved', function() {
+ parent.send( 'saved' );
</ins><span class="cx"> });
</span><span class="cx">
</span><ins>+ // When activated, let the loader handle redirecting the page.
+ // If no loader exists, redirect the page ourselves (if a url exists).
+ api.bind( 'activated', function() {
+ if ( parent.targetWindow() )
+ parent.send( 'activated', api.settings.url.activated );
+ else if ( api.settings.url.activated )
+ window.location = api.settings.url.activated;
+ });
+
</ins><span class="cx"> // Initialize the connection with the parent frame.
</span><span class="cx"> parent.send( 'ready' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjscustomizebasedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-base.dev.js (21028 => 21029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-base.dev.js 2012-06-08 18:45:12 UTC (rev 21028)
+++ trunk/wp-includes/js/customize-base.dev.js 2012-06-08 18:52:44 UTC (rev 21029)
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> send: function( id, data ) {
</span><span class="cx"> var message;
</span><span class="cx">
</span><del>- data = typeof data === 'undefined' ? {} : data;
</del><ins>+ data = typeof data === 'undefined' ? null : data;
</ins><span class="cx">
</span><span class="cx"> if ( ! this.url() || ! this.targetWindow() )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpincludesjscustomizeloaderdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-loader.dev.js (21028 => 21029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-loader.dev.js 2012-06-08 18:45:12 UTC (rev 21028)
+++ trunk/wp-includes/js/customize-loader.dev.js 2012-06-08 18:52:44 UTC (rev 21029)
</span><span class="lines">@@ -98,6 +98,11 @@
</span><span class="cx"> Loader.close();
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ this.messenger.bind( 'activated', function( location ) {
+ if ( location )
+ window.location = location;
+ });
+
</ins><span class="cx"> hash = src.split('?')[1];
</span><span class="cx">
</span><span class="cx"> // Ensure we don't call pushState if the user hit the forward button.
</span></span></pre>
</div>
</div>
</body>
</html>