kotovalexarian-likes-github
/
haml--haml
mirror of https://github.com/haml/haml.git
1
0
Fork 0
Code Releases Activity

[Sass] Don't clobber Rails options due to lazy-loading. 

Use reverse_merge! when initialising default options for Sass::Plugin
to avoid clobbering values that have already been set in
RAILS_ROOT/config/initializers.
This commit is contained in:
codeape 2010-05-18 00:02:01 +10:00 committed by Nathan Weizenbaum
parent fa8ee4217b
commit 59ee889fd2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/sass/plugin/rails.rb
View File

@ -1,12 +1,13 @@
unless defined?(Sass::RAILS_LOADED) unless defined?(Sass::RAILS_LOADED)
Sass::RAILS_LOADED = true Sass::RAILS_LOADED = true
Sass::Plugin.options.merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass', # Reverse-merging (we're in Rails, anyway) so we dont' clobber what's already been defined further up-stream
:css_location => Haml::Util.rails_root + '/public/stylesheets', Sass::Plugin.options.reverse_merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass',
:cache_location => Haml::Util.rails_root + '/tmp/sass-cache', :css_location => Haml::Util.rails_root + '/public/stylesheets',
:always_check => Haml::Util.rails_env == "development", :cache_location => Haml::Util.rails_root + '/tmp/sass-cache',
:quiet => Haml::Util.rails_env != "production", :always_check => Haml::Util.rails_env == "development",
:full_exception => Haml::Util.rails_env != "production") :quiet => Haml::Util.rails_env != "production",
:full_exception => Haml::Util.rails_env != "production")
if defined?(ActionController::Metal) if defined?(ActionController::Metal)
# Rails >= 3.0 # Rails >= 3.0