Fix line_comments configuration setting.

This commit is contained in:
Chris Eppstein 2009-12-01 00:01:46 -08:00
parent 21cf6c870f
commit 0dd89e54f4
3 changed files with 4 additions and 3 deletions

View File

@ -8,6 +8,7 @@ Bug fixes:
* The line-height in the compass reset should have been 1 and not 1em. * The line-height in the compass reset should have been 1 and not 1em.
* Fixed the reference in the rails initializer to the compass configuration file. * Fixed the reference in the rails initializer to the compass configuration file.
* Use the correct error formatting function based on what sass version is installed. * Use the correct error formatting function based on what sass version is installed.
* Boolean properties like line_comments can now be set to false in configuration files
0.10.0.pre1 (November 29, 2009) 0.10.0.pre1 (November 29, 2009)
-------------------------------- --------------------------------

View File

@ -18,7 +18,7 @@ module Compass
end end
plugin_opts = {:template_location => locations} plugin_opts = {:template_location => locations}
plugin_opts[:style] = output_style if output_style plugin_opts[:style] = output_style if output_style
plugin_opts[:line_comments] = line_comments if environment plugin_opts[:line_comments] = line_comments
plugin_opts.merge!(sass_options || {}) plugin_opts.merge!(sass_options || {})
plugin_opts plugin_opts
end end
@ -41,7 +41,7 @@ module Compass
def to_sass_engine_options def to_sass_engine_options
engine_opts = {:load_paths => sass_load_paths} engine_opts = {:load_paths => sass_load_paths}
engine_opts[:style] = output_style if output_style engine_opts[:style] = output_style if output_style
engine_opts[:line_comments] = line_comments if environment engine_opts[:line_comments] = line_comments
engine_opts.merge!(sass_options || {}) engine_opts.merge!(sass_options || {})
end end

View File

@ -37,7 +37,7 @@ module Compass
eval(contents, bind, filename) eval(contents, bind, filename)
ATTRIBUTES.each do |prop| ATTRIBUTES.each do |prop|
value = eval(prop.to_s, bind) rescue nil value = eval(prop.to_s, bind) rescue nil
self.send("#{prop}=", value) if value self.send("#{prop}=", value) unless value.nil?
end end
if @added_import_paths if @added_import_paths
self.additional_import_paths ||= [] self.additional_import_paths ||= []