aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/rails/generators/channel/templates
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-12-16 15:29:21 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-12-16 15:29:21 +0100
commit26bcf81a01bfe12e9f2ef06e4ea84e9e5fa02f9c (patch)
tree039e3cdd2794742d7ecfb0e422a0b3f12410a6f7 /actioncable/lib/rails/generators/channel/templates
parent346a7528eff8aabc9618d0b20a32b36f218d8b2f (diff)
downloadrails-26bcf81a01bfe12e9f2ef06e4ea84e9e5fa02f9c.tar.gz
rails-26bcf81a01bfe12e9f2ef06e4ea84e9e5fa02f9c.tar.bz2
rails-26bcf81a01bfe12e9f2ef06e4ea84e9e5fa02f9c.zip
Move Cable to ActionCable for client-side constant to avoid conflicts
Diffstat (limited to 'actioncable/lib/rails/generators/channel/templates')
-rw-r--r--actioncable/lib/rails/generators/channel/templates/assets/consumer.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/rails/generators/channel/templates/assets/consumer.coffee b/actioncable/lib/rails/generators/channel/templates/assets/consumer.coffee
index 5bb6ab8296..4a608cfe10 100644
--- a/actioncable/lib/rails/generators/channel/templates/assets/consumer.coffee
+++ b/actioncable/lib/rails/generators/channel/templates/assets/consumer.coffee
@@ -1,6 +1,6 @@
-#= require cable
+#= require action_cable
#= require_self
#= require ./channels
@App = {}
-App.cable = Cable.createConsumer()
+App.cable = ActionCable.createConsumer()