Changeset 21033

Timestamp:

06/08/2012 10:59:48 PM (14 years ago)

Author:

koopersmith

Message:

Theme Customizer: Separate message url from preview url in customizer JS Previewer and PreviewFrame objects. fixes #20892.

Location:

trunk

Files:

• wp-admin/js/customize-controls.dev.js (modified) (14 diffs)
• wp-includes/js/customize-base.dev.js (modified) (1 diff)

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

@@ -302 +302 @@
                         api.Messenger.prototype.initialize.call( this, params, options );
 
+                        this.add( 'previewUrl', params.previewUrl );
+
                         this.bind( 'ready', function() {
                                 ready = true;
@@ -311 +313 @@
                         params.query = $.extend( params.query || {}, { customize_messenger_channel: this.channel() });
 
-                        this.request = $.ajax( this.url(), {
+                        this.request = $.ajax( this.previewUrl(), {
                                 type: 'POST',
                                 data: params.query,
@@ -330 +332 @@
                                 // Check if the location response header differs from the current URL.
                                 // If so, the request was redirected; try loading the requested page.
-                                if ( location && location != self.url() ) {
+                                if ( location && location != self.previewUrl() ) {
                                         deferred.rejectWith( self, [ 'redirect', location ] );
                                         return;
@@ -411 +413 @@
                 /**
                  * Requires params:
-                 *  - container - a selector or jQuery element
-                 *  - url       - the URL of preview frame
+                 *  - container  - a selector or jQuery element
+                 *  - previewUrl - the URL of preview frame
                  */
                 initialize: function( params, options ) {
@@ -458 +460 @@
                         this.allowedUrls = params.allowedUrls;
 
-                        url = params.url;
-                        delete params.url;
+                        params.url = window.location.href;
 
                         api.Messenger.prototype.initialize.call( this, params );
-
-                        // We're dynamically generating the iframe, so the origin is set
-                        // to the current window's location, not the url's.
-                        this.origin.unlink( this.url ).set( window.location.href );
 
                         this.add( 'scheme', this.origin() ).link( this.origin ).setter( function( to ) {
@@ -480 +477 @@
                         // ssl certs.
 
-                        this.url.setter( function( to ) {
+                        this.add( 'previewUrl', params.previewUrl ).setter( function( to ) {
                                 var result;
 
@@ -505 +502 @@
                         });
 
-                        // Set the url.
-                        this.url( url );
-
                         // Refresh the preview when the URL is changed (but not yet).
-                        this.url.bind( this.refresh );
+                        this.previewUrl.bind( this.refresh );
 
                         this.scroll = 0;
@@ -517 +511 @@
 
                         // Update the URL when the iframe sends a URL message.
-                        this.bind( 'url', this.url );
+                        this.bind( 'url', this.previewUrl );
                 },
 
@@ -535 +529 @@
 
                         this.loading = new api.PreviewFrame({
-                                url:       this.url(),
-                                query:     this.query() || {},
-                                previewer: this
+                                url:        this.url(),
+                                previewUrl: this.previewUrl(),
+                                query:      this.query() || {},
+                                previewer:  this
                         });
 
@@ -543 +538 @@
                                 // 'this' is the loading frame
                                 this.bind( 'synced', function() {
-                                        if ( self.iframe )
-                                                self.iframe.destroy();
-                                        self.iframe = this;
+                                        if ( self.preview )
+                                                self.preview.destroy();
+                                        self.preview = this;
                                         delete self.loading;
 
@@ -560 +555 @@
                         this.loading.fail( function( reason, location ) {
                                 if ( 'redirect' === reason && location )
-                                        self.url( location );
+                                        self.previewUrl( location );
 
                                 if ( 'logged out' === reason ) {
-                                        if ( self.iframe ) {
-                                                self.iframe.destroy();
-                                                delete self.iframe;
+                                        if ( self.preview ) {
+                                                self.preview.destroy();
+                                                delete self.preview;
                                         }
 
@@ -649 +644 @@
                         container:   '#customize-preview',
                         form:        '#customize-controls',
-                        url:         api.settings.url.preview,
+                        previewUrl:  api.settings.url.preview,
                         allowedUrls: api.settings.url.allowed
                 }, {
@@ -681 +676 @@
                                         // Check if the user is logged out.
                                         if ( '0' === response ) {
-                                                self.iframe.iframe.hide();
+                                                self.preview.iframe.hide();
                                                 self.login().done( function() {
                                                         self.save();
-                                                        self.iframe.iframe.show();
+                                                        self.preview.iframe.show();
                                                 });
                                                 return;
@@ -718 +713 @@
 
                 // Check if preview url is valid and load the preview frame.
-                if ( previewer.url() )
+                if ( previewer.previewUrl() )
                         previewer.refresh();
                 else
-                        previewer.url( api.settings.url.home );
+                        previewer.previewUrl( api.settings.url.home );
 
                 // Save and activated states

trunk/wp-includes/js/customize-base.dev.js

@@ -193 +193 @@
 
                 setter: function( callback ) {
+                        var from = this.get();
                         this._setter = callback;
-                        this.set( this.get() );
+                        // Temporarily clear value so setter can decide if it's valid.
+                        this._value = null;
+                        this.set( from );
                         return this;
                 },