Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-15 03:51:43 +01:00
Code Issues Projects Releases Wiki Activity

Heartbeat: in isLocalFrame() compare window.location.origin to iframe.src to stop most cases where WebKit triggers errors about different iframe origin, see #23216

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@24384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2013-05-30 00:08:53 +00:00
parent 1d1286624d
commit bcdb12da79
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/js/heartbeat.js
View File

@ -65,7 +65,16 @@ window.wp = window.wp || {};
return (new Date()).getTime(); return (new Date()).getTime();
} }
function isLocalFrame(frame) { function isLocalFrame( frame ) {
var origin, src = frame.src;
if ( src && /^https?:\/\//.test( src ) ) {
origin = window.location.origin ? window.location.origin : window.location.protocol + '//' + window.location.host;
if ( src.indexOf( origin ) !== 0 )
return false;
}
try { try {
if ( frame.contentWindow.document ) if ( frame.contentWindow.document )
return true; return true;
@ -150,7 +159,7 @@ window.wp = window.wp || {};
data: send, data: send,
dataType: 'json' dataType: 'json'
}).done( function( response, textStatus, jqXHR ) { }).done( function( response, textStatus, jqXHR ) {
var new_interval, timed; var new_interval;
if ( ! response ) if ( ! response )
return errorstate( 'empty' ); return errorstate( 'empty' );