Merge pull request #34941 from rmacklin/allow-actioncable-to-run-in-web-workers

Avoid ReferenceError exceptions if ActionCable is used in a web worker

2 files changed, 4 insertions, 4 deletions

diff --git a/actioncable/app/javascript/action_cable/adapters.js b/actioncable/app/javascript/action_cable/adapters.js
index 9ba6d338ee..4de8131438 100644
--- a/actioncable/app/javascript/action_cable/adapters.js
+++ b/actioncable/app/javascript/action_cable/adapters.js
@@ -1,4 +1,4 @@
 export default {
-  logger: window.console,
-  WebSocket: window.WebSocket
+  logger: self.console,
+  WebSocket: self.WebSocket
 }
diff --git a/actioncable/app/javascript/action_cable/connection_monitor.js b/actioncable/app/javascript/action_cable/connection_monitor.js
index f0e75ae137..312a71d154 100644
--- a/actioncable/app/javascript/action_cable/connection_monitor.js
+++ b/actioncable/app/javascript/action_cable/connection_monitor.js
@@ -21,7 +21,7 @@ class ConnectionMonitor {
       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`)
     }
   }
@@ -30,7 +30,7 @@ class ConnectionMonitor {
     if (this.isRunning()) {
       this.stoppedAt = now()
       this.stopPolling()
-      document.removeEventListener("visibilitychange", this.visibilityDidChange)
+      removeEventListener("visibilitychange", this.visibilityDidChange)
       logger.log("ConnectionMonitor stopped")
     }
   }