diff options
author | mattab <matthieu.aubry@gmail.com> | 2016-11-14 15:07:47 +0300 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2016-11-14 15:07:47 +0300 |
commit | 7dff6862592f982173db6e9528216a57382811d5 (patch) | |
tree | 15353784d5ce8af8ef8958aba5239ba836b60a29 /js | |
parent | e3e313b6002b2123db8ab996df0cdaa7a42a112e (diff) | |
parent | e4d8bb44a56c1b81be9e218dbdf82be02289d7ac (diff) |
Merge branch '3.x-dev' into bettertrackerasync3.x
Conflicts:
js/piwik.min.js
piwik.js
Diffstat (limited to 'js')
-rw-r--r-- | js/piwik.js | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/js/piwik.js b/js/piwik.js index 96fae74c3c..04afc3cd19 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -6093,18 +6093,25 @@ if (typeof window.Piwik !== 'object') { } }; -/*<DEBUG>*/ /** - * Clear heartbeat. + * Disable heartbeat if it was previously activated. */ this.disableHeartBeatTimer = function () { heartBeatDown(); - configHeartBeatDelay = null; + + if (configHeartBeatDelay || heartBeatSetUp) { + if (windowAlias.removeEventListener) { + windowAlias.removeEventListener('focus', heartBeatOnFocus, true); + windowAlias.removeEventListener('blur', heartBeatOnBlur, true); + } else if (windowAlias.detachEvent) { + windowAlias.detachEvent('onfocus', heartBeatOnFocus); + windowAlias.detachEvent('onblur', heartBeatOnBlur); + } + } - window.removeEventListener('focus', heartBeatOnFocus); - window.removeEventListener('blur', heartBeatOnBlur); + configHeartBeatDelay = null; + heartBeatSetUp = false; }; -/*</DEBUG>*/ /** * Frame buster |