WordPress 4.2

[autoinstalls/wordpress.git] / wp-includes / js / customize-base.js

diff --git a/wp-includes/js/customize-base.js b/wp-includes/js/customize-base.js
index 5ffa9245647baa9da9ddc481f69959a50fda185a..2e0ab1957857d7f8affe21369455b31d5625d751 100644 (file)
--- a/wp-includes/js/customize-base.js
+++ b/wp-includes/js/customize-base.js
@@ -538,11 +538,34 @@ window.wp = window.wp || {};
 
                        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
                        // to this instance, we give the function a new guid.
                        //