diff options
| author | José Valim <jose.valim@gmail.com> | 2011-04-17 10:26:32 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-04-17 10:26:32 +0200 |
| commit | 16b9547a881eb2e201c6f17ec7850bc05c8f6a52 (patch) | |
| tree | e4887106b8a2268aba91ba7f029c51abe2049763 /actionpack | |
| parent | eb75f15a1aaa570fc0eedd1cb5ad0486e0e48450 (diff) | |
| download | rails-16b9547a881eb2e201c6f17ec7850bc05c8f6a52.tar.gz rails-16b9547a881eb2e201c6f17ec7850bc05c8f6a52.tar.bz2 rails-16b9547a881eb2e201c6f17ec7850bc05c8f6a52.zip | |
Move controller configs to sprockets own railtie.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 0dd13fa9bf..d2ba052c8d 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -4,6 +4,7 @@ require "action_dispatch/railtie" require "action_view/railtie" require "abstract_controller/railties/routes_helpers" require "action_controller/railties/paths" +require "sprockets/railtie" module ActionController class Railtie < Rails::Railtie @@ -21,7 +22,6 @@ module ActionController paths = app.config.paths options = app.config.action_controller - options.use_sprockets ||= app.config.assets.enabled options.assets_dir ||= paths["public"].first options.javascripts_dir ||= paths["public/javascripts"].first options.stylesheets_dir ||= paths["public/stylesheets"].first diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb new file mode 100644 index 0000000000..4eb302d4a6 --- /dev/null +++ b/actionpack/lib/sprockets/railtie.rb @@ -0,0 +1,9 @@ +require "sprockets" + +class Sprockets::Railtie < Rails::Railtie + initializer "sprockets.set_configs", :after => "action_controller.set_configs" do |app| + ActiveSupport.on_load(:action_controller) do + self.use_sprockets = app.config.assets.enabled + end + end +end
\ No newline at end of file |