diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-30 03:52:06 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-30 03:53:24 +0200 |
| commit | b2aacc346c8e975cd9ab8c1b0a6b90adbb98debc (patch) | |
| tree | 1e14391ca798fd1f1cbd43a0a42f2639b28bcd23 /actionpack | |
| parent | 7ee5f2eee514f5e9fb53753b830e0caf3dafc2aa (diff) | |
| download | rails-b2aacc346c8e975cd9ab8c1b0a6b90adbb98debc.tar.gz rails-b2aacc346c8e975cd9ab8c1b0a6b90adbb98debc.tar.bz2 rails-b2aacc346c8e975cd9ab8c1b0a6b90adbb98debc.zip | |
Prototype and Scriptaculous are no longer vendored, but provided by prototype-rails from now on, also the -j option of the application generator is removed
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb index 3d815b5e1f..e1ee0d0e1a 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb @@ -99,10 +99,9 @@ module ActionView # # When passing paths, the ".js" extension is optional. # - # To include the default JavaScript expansion pass <tt>:defaults</tt> as source. - # By default, <tt>:defaults</tt> loads jQuery. If the application was generated - # with "-j prototype" the libraries Prototype and Scriptaculous are loaded instead. - # In any case, the defaults can be overridden in <tt>config/application.rb</tt>: + # If the application is not using the asset pipeline, to include the default JavaScript + # expansion pass <tt>:defaults</tt> as source. By default, <tt>:defaults</tt> loads jQuery, + # and that can be overridden in <tt>config/application.rb</tt>: # # config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js) # |