diff options
Diffstat (limited to 'actioncable/app/assets/javascripts/action_cable.js')
-rw-r--r-- | actioncable/app/assets/javascripts/action_cable.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable.js b/actioncable/app/assets/javascripts/action_cable.js index 7710313c40..d860fba76e 100644 --- a/actioncable/app/assets/javascripts/action_cable.js +++ b/actioncable/app/assets/javascripts/action_cable.js @@ -191,8 +191,8 @@ if (!allowReconnect) { this.monitor.stop(); } - if (this.isActive()) { - return this.webSocket ? this.webSocket.close() : undefined; + if (this.isActive() && this.webSocket) { + return this.webSocket.close(); } }; Connection.prototype.reopen = function reopen() { @@ -211,7 +211,9 @@ } }; Connection.prototype.getProtocol = function getProtocol() { - return this.webSocket ? this.webSocket.protocol : undefined; + if (this.webSocket) { + return this.webSocket.protocol; + } }; Connection.prototype.isOpen = function isOpen() { return this.isState("open"); @@ -458,7 +460,9 @@ } function getConfig(name) { var element = document.head.querySelector("meta[name='action-cable-" + name + "']"); - return element ? element.getAttribute("content") : undefined; + if (element) { + return element.getAttribute("content"); + } } function createWebSocketURL(url) { if (url && !/^wss?:/i.test(url)) { |