aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/app/assets/javascripts/action_cable.js
diff options
context:
space:
mode:
authorJavan Makhmali <javan@javan.us>2019-01-16 17:10:57 -0500
committerGitHub <noreply@github.com>2019-01-16 17:10:57 -0500
commit481192171e67c2aad1dc4a3de113a61cca231674 (patch)
tree23f8e7d729a9b089c745fdee2bf7eafb25216e21 /actioncable/app/assets/javascripts/action_cable.js
parenta5fee7d531c06176ecc8815f52d9d54050c274ce (diff)
parent39493185d315162933cd60cdecc8643c98ed845d (diff)
downloadrails-481192171e67c2aad1dc4a3de113a61cca231674.tar.gz
rails-481192171e67c2aad1dc4a3de113a61cca231674.tar.bz2
rails-481192171e67c2aad1dc4a3de113a61cca231674.zip
Merge pull request #34941 from rmacklin/allow-actioncable-to-run-in-web-workers
Avoid ReferenceError exceptions if ActionCable is used in a web worker
Diffstat (limited to 'actioncable/app/assets/javascripts/action_cable.js')
-rw-r--r--actioncable/app/assets/javascripts/action_cable.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable.js b/actioncable/app/assets/javascripts/action_cable.js
index a68c76f299..280adbfa83 100644
--- a/actioncable/app/assets/javascripts/action_cable.js
+++ b/actioncable/app/assets/javascripts/action_cable.js
@@ -3,8 +3,8 @@
})(this, function(exports) {
"use strict";
var adapters = {
- logger: window.console,
- WebSocket: window.WebSocket
+ logger: self.console,
+ WebSocket: self.WebSocket
};
var logger = {
log: function log() {
@@ -49,7 +49,7 @@
this.startedAt = now();
delete this.stoppedAt;
this.startPolling();
- document.addEventListener("visibilitychange", this.visibilityDidChange);
+ addEventListener("visibilitychange", this.visibilityDidChange);
logger.log("ConnectionMonitor started. pollInterval = " + this.getPollInterval() + " ms");
}
};
@@ -57,7 +57,7 @@
if (this.isRunning()) {
this.stoppedAt = now();
this.stopPolling();
- document.removeEventListener("visibilitychange", this.visibilityDidChange);
+ removeEventListener("visibilitychange", this.visibilityDidChange);
logger.log("ConnectionMonitor stopped");
}
};