diff options
| author | Jon Moss <me@jonathanmoss.me> | 2016-01-30 20:39:22 -0500 |
|---|---|---|
| committer | Jon Moss <me@jonathanmoss.me> | 2016-01-30 20:44:42 -0500 |
| commit | 09a706065952d58d515420b19a55df619eb7f53d (patch) | |
| tree | 422b1b5473e7784c56e9a8f5a2bf070a86b87530 /actioncable | |
| parent | 896950a605c509f19f3e8cbde11e23ca87036ca3 (diff) | |
| download | rails-09a706065952d58d515420b19a55df619eb7f53d.tar.gz rails-09a706065952d58d515420b19a55df619eb7f53d.tar.bz2 rails-09a706065952d58d515420b19a55df619eb7f53d.zip | |
Improvements and reorganization of assets
Diffstat (limited to 'actioncable')
| -rw-r--r-- | actioncable/.gitignore | 1 | ||||
| -rw-r--r-- | actioncable/Rakefile | 10 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/index.js | 1 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/source/connection.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/source/connection.coffee) | 0 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/source/connection_monitor.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/source/connection_monitor.coffee) | 0 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/source/consumer.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/source/consumer.coffee) | 0 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/source/index.coffee.erb (renamed from actioncable/lib/assets/javascripts/action_cable/source/index.coffee.erb) | 0 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/source/subscription.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/source/subscription.coffee) | 0 | ||||
| -rw-r--r-- | actioncable/app/assets/javascripts/action_cable/source/subscriptions.coffee (renamed from actioncable/lib/assets/javascripts/action_cable/source/subscriptions.coffee) | 0 | ||||
| -rw-r--r-- | actioncable/lib/assets/javascripts/action_cable/index.js | 1 |
10 files changed, 10 insertions, 3 deletions
diff --git a/actioncable/.gitignore b/actioncable/.gitignore index ceeb05b410..8ded114548 100644 --- a/actioncable/.gitignore +++ b/actioncable/.gitignore @@ -1 +1,2 @@ +/lib/assets/javascripts/action_cable.js /tmp diff --git a/actioncable/Rakefile b/actioncable/Rakefile index 9ba431f8a9..0a036e3e3d 100644 --- a/actioncable/Rakefile +++ b/actioncable/Rakefile @@ -19,10 +19,13 @@ end namespace :assets do desc "Compile dist/action_cable.js" task :compile do + puts 'Compiling Action Cable assets...' + asset_mapping = { "source.js" => "action_cable.js" } root_path = Pathname.new(dir) - load_path = root_path.join("lib/assets/javascripts/action_cable") + load_path = root_path.join("app/assets/javascripts/action_cable") + destination_path = root_path.join("lib/assets/javascripts") compile_path = root_path.join("tmp/sprockets") compile_path.rmtree if compile_path.exist? @@ -36,7 +39,10 @@ namespace :assets do asset_mapping.each do |logical_path, dist_path| fingerprint_path = manifest.assets[logical_path] - FileUtils.cp(compile_path.join(fingerprint_path), load_path.join("dist/#{dist_path}")) + FileUtils.cp(compile_path.join(fingerprint_path), destination_path.join(dist_path)) end + + puts '======' + puts 'Action Cable assets compiled successfully!' end end diff --git a/actioncable/app/assets/javascripts/action_cable/index.js b/actioncable/app/assets/javascripts/action_cable/index.js new file mode 100644 index 0000000000..e97870c3b0 --- /dev/null +++ b/actioncable/app/assets/javascripts/action_cable/index.js @@ -0,0 +1 @@ +//= require_tree ./source diff --git a/actioncable/lib/assets/javascripts/action_cable/source/connection.coffee b/actioncable/app/assets/javascripts/action_cable/source/connection.coffee index fbd7dbd35b..fbd7dbd35b 100644 --- a/actioncable/lib/assets/javascripts/action_cable/source/connection.coffee +++ b/actioncable/app/assets/javascripts/action_cable/source/connection.coffee diff --git a/actioncable/lib/assets/javascripts/action_cable/source/connection_monitor.coffee b/actioncable/app/assets/javascripts/action_cable/source/connection_monitor.coffee index 99b9a1c6d5..99b9a1c6d5 100644 --- a/actioncable/lib/assets/javascripts/action_cable/source/connection_monitor.coffee +++ b/actioncable/app/assets/javascripts/action_cable/source/connection_monitor.coffee diff --git a/actioncable/lib/assets/javascripts/action_cable/source/consumer.coffee b/actioncable/app/assets/javascripts/action_cable/source/consumer.coffee index 717c0641a9..717c0641a9 100644 --- a/actioncable/lib/assets/javascripts/action_cable/source/consumer.coffee +++ b/actioncable/app/assets/javascripts/action_cable/source/consumer.coffee diff --git a/actioncable/lib/assets/javascripts/action_cable/source/index.coffee.erb b/actioncable/app/assets/javascripts/action_cable/source/index.coffee.erb index f4615b7502..f4615b7502 100644 --- a/actioncable/lib/assets/javascripts/action_cable/source/index.coffee.erb +++ b/actioncable/app/assets/javascripts/action_cable/source/index.coffee.erb diff --git a/actioncable/lib/assets/javascripts/action_cable/source/subscription.coffee b/actioncable/app/assets/javascripts/action_cable/source/subscription.coffee index 339d676933..339d676933 100644 --- a/actioncable/lib/assets/javascripts/action_cable/source/subscription.coffee +++ b/actioncable/app/assets/javascripts/action_cable/source/subscription.coffee diff --git a/actioncable/lib/assets/javascripts/action_cable/source/subscriptions.coffee b/actioncable/app/assets/javascripts/action_cable/source/subscriptions.coffee index ae041ffa2b..ae041ffa2b 100644 --- a/actioncable/lib/assets/javascripts/action_cable/source/subscriptions.coffee +++ b/actioncable/app/assets/javascripts/action_cable/source/subscriptions.coffee diff --git a/actioncable/lib/assets/javascripts/action_cable/index.js b/actioncable/lib/assets/javascripts/action_cable/index.js deleted file mode 100644 index 6c69e42337..0000000000 --- a/actioncable/lib/assets/javascripts/action_cable/index.js +++ /dev/null @@ -1 +0,0 @@ -//= require ./dist/action_cable |