diff options
author | rmacklin <1863540+rmacklin@users.noreply.github.com> | 2019-04-02 14:04:43 -0700 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2019-04-02 23:04:43 +0200 |
commit | d03177ffbccb5b30217448d526f1e9aa1fa24297 (patch) | |
tree | c5d9e71dc6126803f357d00f90944d19c37fb5c0 /actioncable/app/assets | |
parent | 2c4dab11d1db468f54b409250f3c39ff555e8d50 (diff) | |
download | rails-d03177ffbccb5b30217448d526f1e9aa1fa24297.tar.gz rails-d03177ffbccb5b30217448d526f1e9aa1fa24297.tar.bz2 rails-d03177ffbccb5b30217448d526f1e9aa1fa24297.zip |
Simplify ActionCable.createWebSocketURL and realphabetize exports (#35810)
* Remove unnecessary variable from ActionCable.createWebSocketURL
* Improve ActionCable test by creating the Consumer before reassigning URL
With this change, the test now actually verifies that the Consumer's url
property changes dynamically (from testURL to `${testURL}foo`).
* Fix alphabetization of ActionCable exports
Diffstat (limited to 'actioncable/app/assets')
-rw-r--r-- | actioncable/app/assets/javascripts/action_cable.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable.js b/actioncable/app/assets/javascripts/action_cable.js index 029c7567ce..8349361405 100644 --- a/actioncable/app/assets/javascripts/action_cable.js +++ b/actioncable/app/assets/javascripts/action_cable.js @@ -477,15 +477,17 @@ return Consumer; }(); function createWebSocketURL(url) { - var webSocketURL = typeof url === "function" ? url() : url; - if (webSocketURL && !/^wss?:/i.test(webSocketURL)) { + if (typeof url === "function") { + url = url(); + } + if (url && !/^wss?:/i.test(url)) { var a = document.createElement("a"); - a.href = webSocketURL; + a.href = url; a.href = a.href; a.protocol = a.protocol.replace("http", "ws"); return a.href; } else { - return webSocketURL; + return url; } } function createConsumer() { @@ -505,8 +507,8 @@ exports.Subscription = Subscription; exports.Subscriptions = Subscriptions; exports.adapters = adapters; - exports.logger = logger; exports.createWebSocketURL = createWebSocketURL; + exports.logger = logger; exports.createConsumer = createConsumer; exports.getConfig = getConfig; Object.defineProperty(exports, "__esModule", { |