aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-05-02 00:59:57 +0200
committerXavier Noria <fxn@hashref.com>2011-05-04 10:33:53 +0200
commitd9c39c3ae9aa9d0f50a4b557781be39e39e5b752 (patch)
treefeab3d5b27ae177f71cdcd043aadb5d8cb6bbf23 /actionpack
parent5d2cdb190ad4eb35ab78180b2fd2e72a3d7a61f7 (diff)
downloadrails-d9c39c3ae9aa9d0f50a4b557781be39e39e5b752.tar.gz
rails-d9c39c3ae9aa9d0f50a4b557781be39e39e5b752.tar.bz2
rails-d9c39c3ae9aa9d0f50a4b557781be39e39e5b752.zip
restores the -j option, but now it accepts the name of any library
If passed "foo", a gem "foo-rails" is added to the Gemfile and "foo" and "foo_ujs" are required in the application JavaScript manifest.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index f20ba7e6d3..80391d72cc 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -6,7 +6,7 @@ module ActionView
class Railtie < Rails::Railtie
config.action_view = ActiveSupport::OrderedOptions.new
config.action_view.stylesheet_expansions = {}
- config.action_view.javascript_expansions = { :defaults => %w(jquery rails) }
+ config.action_view.javascript_expansions = { :defaults => %w(jquery jquery_ujs) }
initializer "action_view.cache_asset_ids" do |app|
unless app.config.cache_classes