aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorAlex Yakoubian <alex@simplevue.com>2011-09-08 13:44:08 -0700
committerAlex Yakoubian <alex@simplevue.com>2011-09-08 13:44:08 -0700
commit901c02d86a1e2cccc8cc2c6ea9ec3f68a6c72607 (patch)
treed7301400831610f1795f1a8d691851312437507f /railties/lib
parente05d4cea69919ed0a2e5832bde120b5d0f12c0ec (diff)
downloadrails-901c02d86a1e2cccc8cc2c6ea9ec3f68a6c72607.tar.gz
rails-901c02d86a1e2cccc8cc2c6ea9ec3f68a6c72607.tar.bz2
rails-901c02d86a1e2cccc8cc2c6ea9ec3f68a6c72607.zip
Fixed assets precompile regex, now accepts Procs
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application/configuration.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 0ca664e4f0..a48db3b6d2 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -37,7 +37,8 @@ module Rails
@assets = ActiveSupport::OrderedOptions.new
@assets.enabled = false
@assets.paths = []
- @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ]
+ @assets.precompile = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) },
+ /application.(css|js)$/ ]
@assets.prefix = "/assets"
@assets.version = ''
@assets.debug = false