Skip to content

Commit

Permalink
Change compressor API so that plugins can register default compressor…
Browse files Browse the repository at this point in the history
…s for their stylesheet or JS engines and still allow the user to turn off compression
  • Loading branch information
tomhuda committed May 24, 2011
1 parent 59f6065 commit 9701db1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
7 changes: 4 additions & 3 deletions actionpack/lib/sprockets/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ def self.using_scss?

# We need to configure this after initialization to ensure we collect
# paths from all engines. This hook is invoked exactly before routes
# are compiled.
# are compiled, and so that other Railties have an opportunity to
# register compressors.
config.after_initialize do |app|
assets = app.config.assets
next unless assets.enabled
Expand Down Expand Up @@ -61,8 +62,8 @@ def asset_environment(app)
env.static_root = File.join(app.root.join("public"), assets.prefix)
env.paths.concat assets.paths
env.logger = Rails.logger
env.js_compressor = expand_js_compressor(assets.js_compressor)
env.css_compressor = expand_css_compressor(assets.css_compressor)
env.js_compressor = expand_js_compressor(assets.js_compressor) if app.assets.compress
env.css_compressor = expand_css_compressor(assets.css_compressor) if app.assets.compress
env
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@

# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin

# Do not compress assets
config.assets.compress = false
end
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
# Disable Rails's static asset server (Apache or nginx will already do this)
config.serve_static_assets = false

# Compress both stylesheets and JavaScripts
# Compress JavaScripts and CSS
config.assets.compress = true

# Specify the default JavaScript compressor
config.assets.js_compressor = :uglifier
config.assets.css_compressor = :scss

# Specifies the header that your server uses for sending files
# (comment out if your front-end server doesn't support this)
Expand Down

0 comments on commit 9701db1

Please sign in to comment.