diff options
| author | Javan Makhmali <javan@javan.us> | 2016-01-30 15:41:14 -0500 |
|---|---|---|
| committer | Jon Moss <me@jonathanmoss.me> | 2016-01-30 20:41:54 -0500 |
| commit | 896950a605c509f19f3e8cbde11e23ca87036ca3 (patch) | |
| tree | 7980c40f97772ed8c047b167ca68c21ae2742bb4 /actioncable/lib | |
| parent | 96355e87cba247246234386b0af9273cc5d59db9 (diff) | |
| download | rails-896950a605c509f19f3e8cbde11e23ca87036ca3.tar.gz rails-896950a605c509f19f3e8cbde11e23ca87036ca3.tar.bz2 rails-896950a605c509f19f3e8cbde11e23ca87036ca3.zip | |
Add task to create precompiled action_cable.js and reorganize to accommodate
Diffstat (limited to 'actioncable/lib')
| -rw-r--r-- | actioncable/lib/assets/javascripts/action_cable/index.js | 1 | ||||
| -rw-r--r-- | actioncable/lib/assets/javascripts/action_cable/source/connection.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/connection.coffee) | 0 | ||||
| -rw-r--r-- | actioncable/lib/assets/javascripts/action_cable/source/connection_monitor.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/connection_monitor.coffee) | 0 | ||||
| -rw-r--r-- | actioncable/lib/assets/javascripts/action_cable/source/consumer.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/consumer.coffee) | 8 | ||||
| -rw-r--r-- | actioncable/lib/assets/javascripts/action_cable/source/index.coffee.erb (renamed from actioncable/lib/assets/javascripts/action_cable.coffee.erb) | 2 | ||||
| -rw-r--r-- | actioncable/lib/assets/javascripts/action_cable/source/subscription.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/subscription.coffee) | 0 | ||||
| -rw-r--r-- | actioncable/lib/assets/javascripts/action_cable/source/subscriptions.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/subscriptions.coffee) | 0 |
7 files changed, 6 insertions, 5 deletions
diff --git a/actioncable/lib/assets/javascripts/action_cable/index.js b/actioncable/lib/assets/javascripts/action_cable/index.js new file mode 100644 index 0000000000..6c69e42337 --- /dev/null +++ b/actioncable/lib/assets/javascripts/action_cable/index.js @@ -0,0 +1 @@ +//= require ./dist/action_cable diff --git a/actioncable/lib/assets/javascripts/action_cable/connection.coffee b/actioncable/lib/assets/javascripts/action_cable/source/connection.coffee index fbd7dbd35b..fbd7dbd35b 100644 --- a/actioncable/lib/assets/javascripts/action_cable/connection.coffee +++ b/actioncable/lib/assets/javascripts/action_cable/source/connection.coffee diff --git a/actioncable/lib/assets/javascripts/action_cable/connection_monitor.coffee b/actioncable/lib/assets/javascripts/action_cable/source/connection_monitor.coffee index 99b9a1c6d5..99b9a1c6d5 100644 --- a/actioncable/lib/assets/javascripts/action_cable/connection_monitor.coffee +++ b/actioncable/lib/assets/javascripts/action_cable/source/connection_monitor.coffee diff --git a/actioncable/lib/assets/javascripts/action_cable/consumer.coffee b/actioncable/lib/assets/javascripts/action_cable/source/consumer.coffee index fcd8d0fb6c..717c0641a9 100644 --- a/actioncable/lib/assets/javascripts/action_cable/consumer.coffee +++ b/actioncable/lib/assets/javascripts/action_cable/source/consumer.coffee @@ -1,7 +1,7 @@ -#= require action_cable/connection -#= require action_cable/connection_monitor -#= require action_cable/subscriptions -#= require action_cable/subscription +#= require ./connection +#= require ./connection_monitor +#= require ./subscriptions +#= require ./subscription # The ActionCable.Consumer establishes the connection to a server-side Ruby Connection object. Once established, # the ActionCable.ConnectionMonitor will ensure that its properly maintained through heartbeats and checking for stale updates. diff --git a/actioncable/lib/assets/javascripts/action_cable.coffee.erb b/actioncable/lib/assets/javascripts/action_cable/source/index.coffee.erb index 7daea4ebcd..f4615b7502 100644 --- a/actioncable/lib/assets/javascripts/action_cable.coffee.erb +++ b/actioncable/lib/assets/javascripts/action_cable/source/index.coffee.erb @@ -1,5 +1,5 @@ #= require_self -#= require action_cable/consumer +#= require ./consumer @ActionCable = INTERNAL: <%= ActionCable::INTERNAL.to_json %> diff --git a/actioncable/lib/assets/javascripts/action_cable/subscription.coffee b/actioncable/lib/assets/javascripts/action_cable/source/subscription.coffee index 339d676933..339d676933 100644 --- a/actioncable/lib/assets/javascripts/action_cable/subscription.coffee +++ b/actioncable/lib/assets/javascripts/action_cable/source/subscription.coffee diff --git a/actioncable/lib/assets/javascripts/action_cable/subscriptions.coffee b/actioncable/lib/assets/javascripts/action_cable/source/subscriptions.coffee index ae041ffa2b..ae041ffa2b 100644 --- a/actioncable/lib/assets/javascripts/action_cable/subscriptions.coffee +++ b/actioncable/lib/assets/javascripts/action_cable/source/subscriptions.coffee |