diff options
| author | Javan Makhmali <javan@javan.us> | 2016-03-03 21:27:52 -0500 |
|---|---|---|
| committer | Javan Makhmali <javan@javan.us> | 2016-03-03 21:27:52 -0500 |
| commit | 6689d7c7b9c17e3e2512060c560635ce2de9ef99 (patch) | |
| tree | c68c0f76858013cb9b11d50ad10d06ec209a4c08 | |
| parent | 5e84b9557868fe19c45f4da89d448e40b87a1f52 (diff) | |
| download | rails-6689d7c7b9c17e3e2512060c560635ce2de9ef99.tar.gz rails-6689d7c7b9c17e3e2512060c560635ce2de9ef99.tar.bz2 rails-6689d7c7b9c17e3e2512060c560635ce2de9ef99.zip | |
Share default mount path with client side .js
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable.coffee.erb | 2 | ||||
| -rw-r--r-- | actioncable/lib/action_cable.rb | 3 | ||||
| -rw-r--r-- | actioncable/lib/action_cable/engine.rb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable.coffee.erb b/actioncable/app/assets/javascripts/action_cable.coffee.erb index d2dd8ce25f..f0422d9d9c 100644 --- a/actioncable/app/assets/javascripts/action_cable.coffee.erb +++ b/actioncable/app/assets/javascripts/action_cable.coffee.erb @@ -5,7 +5,7 @@ INTERNAL: <%= ActionCable::INTERNAL.to_json %> createConsumer: (url) -> - url ?= @getConfig("url") ? "/cable" + url ?= @getConfig("url") ? @INTERNAL.default_mount_path new ActionCable.Consumer @createWebSocketURL(url) getConfig: (name) -> diff --git a/actioncable/lib/action_cable.rb b/actioncable/lib/action_cable.rb index a8e4d1cb25..68a5fff3e7 100644 --- a/actioncable/lib/action_cable.rb +++ b/actioncable/lib/action_cable.rb @@ -34,7 +34,8 @@ module ActionCable ping: 'ping'.freeze, confirmation: 'confirm_subscription'.freeze, rejection: 'reject_subscription'.freeze - } + }, + default_mount_path: '/cable'.freeze } # Singleton instance of the server diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb index c90aadaf2c..7dc541d00c 100644 --- a/actioncable/lib/action_cable/engine.rb +++ b/actioncable/lib/action_cable/engine.rb @@ -6,7 +6,7 @@ require "active_support/core_ext/hash/indifferent_access" module ActionCable class Railtie < Rails::Engine # :nodoc: config.action_cable = ActiveSupport::OrderedOptions.new - config.action_cable.mount_path = '/cable' + config.action_cable.mount_path = ActionCable::INTERNAL[:default_mount_path] config.eager_load_namespaces << ActionCable |