golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Theme Customizer: Prevent messengers from binding to the current window when a parent doesn't exist. see #19910. 

git-svn-id: http://core.svn.wordpress.org/trunk@20897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2012-05-25 16:19:18 +00:00
parent ff8b21eb47
commit c71b8d0925
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/js/customize-base.dev.js
View File

@ -482,10 +482,13 @@ if ( typeof wp === 'undefined' )
},
initialize: function( url, targetWindow, options ) {
// Target the parent frame by default, but only if a parent frame exists.
var defaultTarget = window.parent == window ? null : window.parent;
$.extend( this, options || {} );
url = this.add( 'url', url );
this.add( 'targetWindow', targetWindow || window.parent );
this.add( 'targetWindow', targetWindow || defaultTarget );
this.add( 'origin', url() ).link( url ).setter( function( to ) {
return to.replace( /([^:]+:\/\/[^\/]+).*/, '$1' );
});
@ -503,6 +506,9 @@ if ( typeof wp === 'undefined' )
event = event.originalEvent;
if ( ! this.targetWindow() )
return;
// Check to make sure the origin is valid.
if ( this.origin() && event.origin !== this.origin() )
return;
@ -518,7 +524,7 @@ if ( typeof wp === 'undefined' )
data = typeof data === 'undefined' ? {} : data;
if ( ! this.url() )
if ( ! this.url() || ! this.targetWindow() )
return;
message = JSON.stringify({ id: id, data: data });