Changeset 24384

Timestamp:

05/30/2013 12:08:53 AM (11 years ago)

Author:

azaozz

Message:

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

File:

• trunk/wp-includes/js/heartbeat.js (modified) (2 diffs)

trunk/wp-includes/js/heartbeat.js

@@ -66 +66 @@
         }
 
-        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 {
                 if ( frame.contentWindow.document )
@@ -151 +160 @@
                 dataType: 'json'
             }).done( function( response, textStatus, jqXHR ) {
-                var new_interval, timed;
+                var new_interval;
 
                 if ( ! response )