Merge branch 'master' into db_system_change_command

2 files changed, 10 insertions, 8 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() {
diff --git a/actioncable/app/javascript/action_cable/index.js b/actioncable/app/javascript/action_cable/index.js
index 9f41c14e94..659418396f 100644
--- a/actioncable/app/javascript/action_cable/index.js
+++ b/actioncable/app/javascript/action_cable/index.js
@@ -18,17 +18,15 @@ export {
   logger,
 }
 
-export function createConsumer(url) {
-  if (url == null) {
-    const urlConfig = getConfig("url")
-    url = (urlConfig ? urlConfig : INTERNAL.default_mount_path)
-  }
+export function createConsumer(url = getConfig("url") || INTERNAL.default_mount_path) {
   return new Consumer(createWebSocketURL(url))
 }
 
 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) {