mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
[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:
parent
fa8ee4217b
commit
59ee889fd2
1 changed files with 7 additions and 6 deletions
|
@ -1,7 +1,8 @@
|
|||
unless defined?(Sass::RAILS_LOADED)
|
||||
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
|
||||
Sass::Plugin.options.reverse_merge!(:template_location => Haml::Util.rails_root + '/public/stylesheets/sass',
|
||||
:css_location => Haml::Util.rails_root + '/public/stylesheets',
|
||||
:cache_location => Haml::Util.rails_root + '/tmp/sass-cache',
|
||||
:always_check => Haml::Util.rails_env == "development",
|
||||
|
|
Loading…
Add table
Reference in a new issue