Only compute the sass engine options once in the update_project command -- this is called repeatedly by the watcher command.

This commit is contained in:
Chris Eppstein 2011-04-20 19:23:21 -07:00
parent fec367d60c
commit 5f1c35d171

View File

@ -49,17 +49,20 @@ module Compass
end end
def new_compiler_instance(additional_options = {}) def new_compiler_instance(additional_options = {})
compiler_opts = Compass.sass_engine_options @compiler_opts ||= begin
compiler_opts.merge!(:force => options[:force], compiler_opts = Compass.sass_engine_options
:sass_files => explicit_sass_files, compiler_opts.merge!(:force => options[:force],
:dry_run => options[:dry_run]) :sass_files => explicit_sass_files,
compiler_opts[:quiet] = options[:quiet] if options[:quiet] :dry_run => options[:dry_run])
compiler_opts[:time] = options[:time] if options[:time] compiler_opts[:quiet] = options[:quiet] if options[:quiet]
compiler_opts.merge!(additional_options) compiler_opts[:time] = options[:time] if options[:time]
Sass::Engine.normalize_options(compiler_opts)
end
Compass::Compiler.new(working_path, Compass::Compiler.new(working_path,
Compass.configuration.sass_path, Compass.configuration.sass_path,
Compass.configuration.css_path, Compass.configuration.css_path,
compiler_opts) @compiler_opts.merge(additional_options))
end end
def explicit_sass_files def explicit_sass_files