diff options
| author | Jon Moss <me@jonathanmoss.me> | 2016-05-27 13:07:13 -0400 |
|---|---|---|
| committer | Jon Moss <me@jonathanmoss.me> | 2016-05-31 13:06:08 -0400 |
| commit | 66901c1849efae74c8a58fe0cb36afd487c067cc (patch) | |
| tree | ee8c16cfe1668d937fc6f04cf450e9e7f7aacc78 /actioncable/app | |
| parent | 998bbbcc0e043e16b96613387cdb8f0ee4784ff2 (diff) | |
| download | rails-66901c1849efae74c8a58fe0cb36afd487c067cc.tar.gz rails-66901c1849efae74c8a58fe0cb36afd487c067cc.tar.bz2 rails-66901c1849efae74c8a58fe0cb36afd487c067cc.zip | |
Add configuration for `WebSocket` and `logger`
[Javan Makhmali, Jon Moss]
Diffstat (limited to 'actioncable/app')
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable.coffee.erb | 4 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/connection.coffee | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable.coffee.erb b/actioncable/app/assets/javascripts/action_cable.coffee.erb index 210a3ae17e..e0758dae72 100644 --- a/actioncable/app/assets/javascripts/action_cable.coffee.erb +++ b/actioncable/app/assets/javascripts/action_cable.coffee.erb @@ -4,6 +4,8 @@ @ActionCable = INTERNAL: <%= ActionCable::INTERNAL.to_json %> + WebSocket: window.WebSocket + logger: window.console createConsumer: (url) -> url ?= @getConfig("url") ? @INTERNAL.default_mount_path @@ -33,4 +35,4 @@ log: (messages...) -> if @debugging messages.push(Date.now()) - console.log("[ActionCable]", messages...) + @logger.log("[ActionCable]", messages...) diff --git a/actioncable/app/assets/javascripts/action_cable/connection.coffee b/actioncable/app/assets/javascripts/action_cable/connection.coffee index d6a6397804..29ad676290 100644 --- a/actioncable/app/assets/javascripts/action_cable/connection.coffee +++ b/actioncable/app/assets/javascripts/action_cable/connection.coffee @@ -27,7 +27,7 @@ class ActionCable.Connection else ActionCable.log("Opening WebSocket, current state is #{@getState()}, subprotocols: #{protocols}") @uninstallEventHandlers() if @webSocket? - @webSocket = new WebSocket(@consumer.url, protocols) + @webSocket = new ActionCable.WebSocket(@consumer.url, protocols) @installEventHandlers() @monitor.start() true |