Changeset 23389

Timestamp:

02/06/2013 07:10:04 AM (14 years ago)

Author:

azaozz

Message:

Heartbeat API: fix error in IE < 9, props SergeyBiryukov, don't attempt to bind events to cross-domain iframes, see #23216

File:

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

trunk/wp-includes/js/heartbeat.js

@@ -32 +32 @@
                 if ( typeof( window.heartbeatSettings != 'undefined' ) ) {
                         settings = $.extend( {}, window.heartbeatSettings );
-                        delete window.heartbeatSettings;
+                        window.heartbeatSettings = null;
 
                         // Add private vars
@@ -62 +62 @@
 
                         return (new Date()).getTime();
+                }
+
+                function isLocalFrame(frame) {
+                        try {
+                                if ( frame.contentWindow.document )
+                                        return true;
+                        } catch(e) {}
+
+                        return false;
                 }
 
@@ -188 +197 @@
                 function setFrameEvents() {
                         $('iframe').each( function(i, frame){
+                                if ( !isLocalFrame(frame) )
+                                        return;
+
                                 if ( $.data(frame, 'wp-heartbeat-focus') )
                                         return;
@@ -207 +219 @@
                 }).on('focus.wp-heartbeat-focus', function(){
                         $('iframe').each( function(i, frame){
+                                if ( !isLocalFrame(frame) )
+                                        return;
+
                                 $.removeData(frame, 'wp-heartbeat-focus');
                                 $(frame.contentWindow).off('.wp-heartbeat-focus');
@@ -218 +233 @@
                         $(document).off('.wp-heartbeat-active');
                         $('iframe').each( function(i, frame){
+                                if ( !isLocalFrame(frame) )
+                                        return;
+
                                 $(frame.contentWindow).off('.wp-heartbeat-active');
                         });
@@ -244 +262 @@
                                 $(document).on('mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); });
                                 $('iframe').each( function(i, frame){
+                                        if ( !isLocalFrame(frame) )
+                                                return;
+
                                         $(frame.contentWindow).on('mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); });
                                 });