Changeset 21071

Timestamp:

06/12/2012 10:51:55 PM (14 years ago)

Author:

ryan

Message:

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 #20926

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• includes/ajax-actions.php (modified) (1 diff)
• js/customize-controls.dev.js (modified) (5 diffs)

trunk/wp-admin/admin-ajax.php

@@ -39 +39 @@
 $core_actions_get = array(
         'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
-        'autocomplete-user', 'dashboard-widgets',
+        'autocomplete-user', 'dashboard-widgets', 'logged-in',
 );
 

trunk/wp-admin/includes/ajax-actions.php

@@ -211 +211 @@
         }
         wp_die();
+}
+
+function wp_ajax_logged_in() {
+        wp_die( 1 );
 }
 

trunk/wp-admin/js/customize-controls.dev.js

@@ -289 +289 @@
 
                 initialize: function( params, options ) {
-                        var loaded   = false,
-                                ready    = false,
-                                deferred = $.Deferred(),
+                        var deferred = $.Deferred(),
                                 self     = this;
 
@@ -305 +303 @@
                         this.add( 'previewUrl', params.previewUrl );
 
-                        this.bind( 'ready', function() {
+                        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() {
                                 ready = true;
 
                                 if ( loaded )
                                         deferred.resolveWith( self );
-                        });
-
-                        params.query = $.extend( params.query || {}, { customize_messenger_channel: this.channel() });
+                        };
+
+                        this.bind( 'ready', this._ready );
 
                         this.request = $.ajax( this.previewUrl(), {
                                 type: 'POST',
-                                data: params.query,
+                                data: this.query,
                                 xhrFields: {
                                         withCredentials: true
@@ -340 +351 @@
                                 // Check if the user is not logged in.
                                 if ( '0' === response ) {
-                                        deferred.rejectWith( self, [ 'logged out' ] );
+                                        self.login( deferred );
                                         return;
                                 }
@@ -357 +368 @@
                                 }
 
-                                // Strip the signature from the request.
-                                response = response.slice( 0, index ) + response.slice( index + signature.length );
-
-                                // Create the iframe and inject the html content.
                                 // Strip the signature from the request.
                                 response = response.slice( 0, index ) + response.slice( index + signature.length );
@@ -386 +393 @@
                                 self.targetWindow().document.write( response );
                                 self.targetWindow().document.close();
+                        });
+                },
+
+                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 );
+                                });
                         });
                 },