diff options
| author | wycats <wycats@gmail.com> | 2011-06-16 12:08:26 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2011-06-16 12:09:36 -0700 |
| commit | 1844572fd129f03bc6741b3ae928b730133cf6e3 (patch) | |
| tree | 00db456a3998fc6e92b7ba8b718509929c200eb0 | |
| parent | b9fa32c75e4ac6986c22880085657f44972124a4 (diff) | |
| download | rails-1844572fd129f03bc6741b3ae928b730133cf6e3.tar.gz rails-1844572fd129f03bc6741b3ae928b730133cf6e3.tar.bz2 rails-1844572fd129f03bc6741b3ae928b730133cf6e3.zip | |
Make the API for compression consistent between JS and CSS. By default, users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem.
Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 8 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index 9fb66a1833..38eb00ce01 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -63,8 +63,12 @@ module Sprockets env.logger = Rails.logger - env.js_compressor = expand_js_compressor(assets.js_compressor) - env.css_compressor = expand_css_compressor(assets.css_compressor) + if assets.compress + # temporarily hardcode default JS compressor to uglify. Soon, it will work + # the same as SCSS, where a default plugin sets the default. + env.js_compressor = expand_js_compressor(assets.js_compressor || :uglifier) + env.css_compressor = expand_css_compressor(assets.css_compressor) + end env end diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 60e26755fe..06ed890e05 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -14,9 +14,6 @@ # Compress JavaScripts and CSS config.assets.compress = true - # Specify the default JavaScript compressor - config.assets.js_compressor = :uglifier - # Specifies the header that your server uses for sending files # (comment out if your front-end server doesn't support this) config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx |