diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-16 16:24:43 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-16 16:24:43 -0700 |
| commit | 4c4dd06aa6d6aaa55bd56eac1c439f944b6733d1 (patch) | |
| tree | 875a35d67d9ac94e8fc5f1457c6505baa0cda9d4 /actioncable | |
| parent | bca187219843fd49aba6415880d07fe8cb19f5f5 (diff) | |
| parent | aa757d0c1151f83104da241f30b1924d748a5d78 (diff) | |
| download | rails-4c4dd06aa6d6aaa55bd56eac1c439f944b6733d1.tar.gz rails-4c4dd06aa6d6aaa55bd56eac1c439f944b6733d1.tar.bz2 rails-4c4dd06aa6d6aaa55bd56eac1c439f944b6733d1.zip | |
Merge pull request #24574 from y-yagi/donot_remove_cable.js
don't remove `cable.js` when a channel is removed
Diffstat (limited to 'actioncable')
| -rw-r--r-- | actioncable/lib/rails/generators/channel/channel_generator.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actioncable/lib/rails/generators/channel/channel_generator.rb b/actioncable/lib/rails/generators/channel/channel_generator.rb index 3bcf5f1898..05fd21a954 100644 --- a/actioncable/lib/rails/generators/channel/channel_generator.rb +++ b/actioncable/lib/rails/generators/channel/channel_generator.rb @@ -13,7 +13,9 @@ module Rails template "channel.rb", File.join('app/channels', class_path, "#{file_name}_channel.rb") if options[:assets] - template "assets/cable.js", "app/assets/javascripts/cable.js" + if self.behavior == :invoke + template "assets/cable.js", "app/assets/javascripts/cable.js" + end template "assets/channel.coffee", File.join('app/assets/javascripts/channels', class_path, "#{file_name}.coffee") end |