diff options
author | Richard Macklin <richard.github@nrm.com> | 2019-01-14 11:35:04 -0800 |
---|---|---|
committer | Richard Macklin <richard.github@nrm.com> | 2019-01-14 11:35:04 -0800 |
commit | 6320916513891938f7d2f0b5c9c36968ee2d8705 (patch) | |
tree | 986965d8b9eb7cd3b0592dad07fd7b31e56a3ba2 /actioncable | |
parent | dbe073aebf198493a1a162d314c49dfcd5dbbf1b (diff) | |
download | rails-6320916513891938f7d2f0b5c9c36968ee2d8705.tar.gz rails-6320916513891938f7d2f0b5c9c36968ee2d8705.tar.bz2 rails-6320916513891938f7d2f0b5c9c36968ee2d8705.zip |
Simplify ActionCable.getConfig, Connection#getProtocol, and Connection#close
by relying on the implicit undefined return value
Diffstat (limited to 'actioncable')
-rw-r--r-- | actioncable/app/assets/javascripts/action_cable.js | 12 | ||||
-rw-r--r-- | actioncable/app/javascript/action_cable/connection.js | 8 | ||||
-rw-r--r-- | actioncable/app/javascript/action_cable/index.js | 4 |
3 files changed, 17 insertions, 7 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)) { 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) { |