diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-01-14 15:24:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-14 15:24:26 -0500 |
| commit | 0ffafd475bf4dbc2d0d30b0f06c99af9fbe22f01 (patch) | |
| tree | 5895c7d9c1e42b6e0161cdb28dfb2e6273770730 /actioncable/app/javascript/action_cable/connection.js | |
| parent | 54d4a518d9a8079c9bc03bee454e966e93036942 (diff) | |
| parent | 739f88e52ec9d673e23f41545d55626351ce24eb (diff) | |
| download | rails-0ffafd475bf4dbc2d0d30b0f06c99af9fbe22f01.tar.gz rails-0ffafd475bf4dbc2d0d30b0f06c99af9fbe22f01.tar.bz2 rails-0ffafd475bf4dbc2d0d30b0f06c99af9fbe22f01.zip | |
Merge pull request #34934 from rmacklin/simplify-actioncable-methods-after-decaffeination
Clean up ActionCable JS a bit more after the CoffeeScript conversion
Diffstat (limited to 'actioncable/app/javascript/action_cable/connection.js')
| -rw-r--r-- | actioncable/app/javascript/action_cable/connection.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actioncable/app/javascript/action_cable/connection.js b/actioncable/app/javascript/action_cable/connection.js index b2910cb2a6..96bac132c1 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()) { + 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() { |