aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/railtie.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view/railtie.rb')
-rw-r--r--actionpack/lib/action_view/railtie.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index d453f30882..8c7b7d64c2 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -5,8 +5,7 @@ module ActionView
# = Action View Railtie
class Railtie < Rails::Railtie
config.action_view = ActiveSupport::OrderedOptions.new
-
- # setup default js includes
+ config.action_view.stylesheet_expansions = {}
config.action_view.javascript_expansions = { :defaults => ['prototype', 'effects', 'dragdrop', 'controls', 'rails'] }
require "action_view/railties/log_subscriber"
@@ -22,7 +21,13 @@ module ActionView
initializer "action_view.javascript_expansions" do |app|
ActiveSupport.on_load(:action_view) do
- ActionView::Helpers::AssetTagHelper.register_javascript_expansion(app.config.action_view.javascript_expansions)
+ ActionView::Helpers::AssetTagHelper.register_javascript_expansion(
+ app.config.action_view.delete(:javascript_expansions)
+ )
+
+ ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion(
+ app.config.action_view.delete(:stylesheet_expansions)
+ )
end
end