Ticket #31687: 31687.3.diff

wp-admin/js/customize-controls.js

@@ -1929 +1929 @@
 
                         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 );
                 },
 
@@ -2118 +2137 @@
                 tmpl = api.settings.documentTitleTmpl;
                 title = tmpl.replace( '%s', documentTitle );
                 document.title = title;
-                if ( window !== window.parent ) {
-                        window.parent.document.title = document.title;
-                }
+                api.trigger( 'title', title );
         };
 
         /**
@@ -2799 +2816 @@
                                 window.location = api.settings.url.activated;
                 });
 
+                // Pass titles to the parent
+                api.bind( 'title', function( newTitle ) {
+                        parent.send( 'title', newTitle );
+                });
+
                 // Initialize the connection with the parent frame.
                 parent.send( 'ready' );
 

wp-includes/js/customize-loader.js

@@ -155 +155 @@
                                 Loader.saved( false );
                         } );
 
+                        this.messenger.bind( 'title', function( newTitle ){
+                                window.document.title = newTitle;
+                        });
+
                         this.pushState( src );
 
                         this.trigger( 'open' );