<!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>[21071] trunk/wp-admin: Customize: If the preview is not logged in but the admin is, perform a front page request to setup any mapped domain cookies and then retry loading the preview.</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/21071">21071</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-06-12 22:51:55 +0000 (Tue, 12 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Customize: If the preview is not logged in but the admin is, perform a front page request to setup any mapped domain cookies and then retry loading the preview.
Props nacin, koopersmith
fixes <a href="http://core.trac.wordpress.org/ticket/20926">#20926</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminjscustomizecontrolsdevjs">trunk/wp-admin/js/customize-controls.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (21070 => 21071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2012-06-12 19:27:41 UTC (rev 21070)
+++ trunk/wp-admin/admin-ajax.php 2012-06-12 22:51:55 UTC (rev 21071)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> $core_actions_get = array(
</span><span class="cx"> 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
</span><del>- 'autocomplete-user', 'dashboard-widgets',
</del><ins>+ 'autocomplete-user', 'dashboard-widgets', 'logged-in',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $core_actions_post = array(
</span></span></pre></div>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (21070 => 21071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-06-12 19:27:41 UTC (rev 21070)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-06-12 22:51:55 UTC (rev 21071)
</span><span class="lines">@@ -212,6 +212,10 @@
</span><span class="cx"> wp_die();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function wp_ajax_logged_in() {
+ wp_die( 1 );
+}
+
</ins><span class="cx"> /*
</span><span class="cx"> * Ajax helper.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadminjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/customize-controls.dev.js (21070 => 21071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/customize-controls.dev.js 2012-06-12 19:27:41 UTC (rev 21070)
+++ trunk/wp-admin/js/customize-controls.dev.js 2012-06-12 22:51:55 UTC (rev 21071)
</span><span class="lines">@@ -288,9 +288,7 @@
</span><span class="cx"> sensitivity: 2000,
</span><span class="cx">
</span><span class="cx"> initialize: function( params, options ) {
</span><del>- var loaded = false,
- ready = false,
- deferred = $.Deferred(),
</del><ins>+ var deferred = $.Deferred(),
</ins><span class="cx"> self = this;
</span><span class="cx">
</span><span class="cx"> // This is the promise object.
</span><span class="lines">@@ -304,18 +302,31 @@
</span><span class="cx">
</span><span class="cx"> this.add( 'previewUrl', params.previewUrl );
</span><span class="cx">
</span><del>- this.bind( 'ready', function() {
</del><ins>+ this.query = $.extend( params.query || {}, { customize_messenger_channel: this.channel() });
+
+ this.run( deferred );
+ },
+
+ run: function( deferred ) {
+ var self = this,
+ loaded = false,
+ ready = false;
+
+ if ( this._ready )
+ this.unbind( 'ready', this._ready );
+
+ this._ready = function() {
</ins><span class="cx"> ready = true;
</span><span class="cx">
</span><span class="cx"> if ( loaded )
</span><span class="cx"> deferred.resolveWith( self );
</span><del>- });
</del><ins>+ };
</ins><span class="cx">
</span><del>- params.query = $.extend( params.query || {}, { customize_messenger_channel: this.channel() });
</del><ins>+ this.bind( 'ready', this._ready );
</ins><span class="cx">
</span><span class="cx"> this.request = $.ajax( this.previewUrl(), {
</span><span class="cx"> type: 'POST',
</span><del>- data: params.query,
</del><ins>+ data: this.query,
</ins><span class="cx"> xhrFields: {
</span><span class="cx"> withCredentials: true
</span><span class="cx"> }
</span><span class="lines">@@ -339,7 +350,7 @@
</span><span class="cx">
</span><span class="cx"> // Check if the user is not logged in.
</span><span class="cx"> if ( '0' === response ) {
</span><del>- deferred.rejectWith( self, [ 'logged out' ] );
</del><ins>+ self.login( deferred );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -360,10 +371,6 @@
</span><span class="cx"> response = response.slice( 0, index ) + response.slice( index + signature.length );
</span><span class="cx">
</span><span class="cx"> // Create the iframe and inject the html content.
</span><del>- // Strip the signature from the request.
- response = response.slice( 0, index ) + response.slice( index + signature.length );
-
- // Create the iframe and inject the html content.
</del><span class="cx"> self.iframe = $('<iframe />').appendTo( self.previewer.container );
</span><span class="cx">
</span><span class="cx"> // Bind load event after the iframe has been added to the page;
</span><span class="lines">@@ -388,6 +395,37 @@
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ login: function( deferred ) {
+ var self = this,
+ reject;
+
+ reject = function() {
+ deferred.rejectWith( self, [ 'logged out' ] );
+ };
+
+ if ( this.triedLogin )
+ return reject();
+
+ // Check if we have an admin cookie.
+ $.get( api.settings.url.ajax, {
+ action: 'logged-in'
+ }).fail( reject ).done( function( response ) {
+ var iframe;
+
+ if ( '1' !== response )
+ reject();
+
+ iframe = $('<iframe src="' + self.previewUrl() + '" />').hide();
+ iframe.appendTo( self.previewer.container );
+ iframe.load( function() {
+ self.triedLogin = true;
+
+ iframe.remove();
+ self.run( deferred );
+ });
+ });
+ },
+
</ins><span class="cx"> destroy: function() {
</span><span class="cx"> api.Messenger.prototype.destroy.call( this );
</span><span class="cx"> this.request.abort();
</span></span></pre>
</div>
</div>
</body>
</html>