aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/app/javascript/action_cable
diff options
context:
space:
mode:
Diffstat (limited to 'actioncable/app/javascript/action_cable')
-rw-r--r--actioncable/app/javascript/action_cable/connection.js8
-rw-r--r--actioncable/app/javascript/action_cable/index.js4
2 files changed, 9 insertions, 3 deletions
diff --git a/actioncable/app/javascript/action_cable/connection.js b/actioncable/app/javascript/action_cable/connection.js
index b2910cb2a6..fddb920748 100644
--- a/actioncable/app/javascript/action_cable/connection.js
+++ b/actioncable/app/javascript/action_cable/connection.js
@@ -44,7 +44,9 @@ class Connection {
close({allowReconnect} = {allowReconnect: true}) {
if (!allowReconnect) { this.monitor.stop() }
- if (this.isActive()) { return (this.webSocket ? this.webSocket.close() : undefined) }
+ if (this.isActive() && this.webSocket) {
+ return this.webSocket.close()
+ }
}
reopen() {
@@ -65,7 +67,9 @@ class Connection {
}
getProtocol() {
- return (this.webSocket ? this.webSocket.protocol : undefined)
+ if (this.webSocket) {
+ return this.webSocket.protocol
+ }
}
isOpen() {
diff --git a/actioncable/app/javascript/action_cable/index.js b/actioncable/app/javascript/action_cable/index.js
index ddcd4dcebc..659418396f 100644
--- a/actioncable/app/javascript/action_cable/index.js
+++ b/actioncable/app/javascript/action_cable/index.js
@@ -24,7 +24,9 @@ export function createConsumer(url = getConfig("url") || INTERNAL.default_mount_
export function getConfig(name) {
const element = document.head.querySelector(`meta[name='action-cable-${name}']`)
- return (element ? element.getAttribute("content") : undefined)
+ if (element) {
+ return element.getAttribute("content")
+ }
}
export function createWebSocketURL(url) {