Changeset 31893

Timestamp:

03/25/2015 11:35:37 PM (11 years ago)

Author:

ocean90

Message:

Customizer: [31885] actually hasn't fixed the SecurityErrors. This one does.

props mattwiebe.
fixes #31687.

Location:

trunk/src

Files:

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

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

@@ -1930 +1930 @@
                         this.query = $.extend( params.query || {}, { customize_messenger_channel: this.channel() });
 
-                        // This avoids SecurityErrors when setting a window object in x-origin iframe'd scenarios.
-                        this.targetWindow.set = function( to ) {
-                                var from = this._value;
-
-                                to = this._setter.apply( this, arguments );
-                                to = this.validate( to );
-
-                                if ( null === to || from === to ) {
-                                        return this;
-                                }
-
-                                this._value = to;
-                                this._dirty = true;
-
-                                this.callbacks.fireWith( this, [ to, from ] );
-
-                                return this;
-                        };
-
                         this.run( deferred );
                 },

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

@@ -539 +539 @@
                         this.add( 'channel', params.channel );
                         this.add( 'url', params.url || '' );
-                        this.add( 'targetWindow', params.targetWindow || defaultTarget );
                         this.add( 'origin', this.url() ).link( this.url ).setter( function( to ) {
                                 return to.replace( /([^:]+:\/\/[^\/]+).*/, '$1' );
                         });
+
+                        // first add with no value
+                        this.add( 'targetWindow', null );
+                        // This avoids SecurityErrors when setting a window object in x-origin iframe'd scenarios.
+                        this.targetWindow.set = function( to ) {
+                                var from = this._value;
+
+                                to = this._setter.apply( this, arguments );
+                                to = this.validate( to );
+
+                                if ( null === to || from === to ) {
+                                        return this;
+                                }
+
+                                this._value = to;
+                                this._dirty = true;
+
+                                this.callbacks.fireWith( this, [ to, from ] );
+
+                                return this;
+                        };
+                        // now set it
+                        this.targetWindow( params.targetWindow || defaultTarget );
+
 
                         // Since we want jQuery to treat the receive function as unique