Merge pull request #34934 from rmacklin/simplify-actioncable-methods-after-decaffeination

Clean up ActionCable JS a bit more after the CoffeeScript conversion

1 files changed, 4 insertions, 6 deletions

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) {