lib/compass/configuration/helpers.rb in compass-0.10.6 vs lib/compass/configuration/helpers.rb in compass-0.11.alpha.0
- old
+ new
@@ -52,22 +52,18 @@
def sass_plugin_configuration
configuration.to_sass_plugin_options
end
def configure_sass_plugin!
- return if sass_plugin_configured?
require 'sass/plugin'
- @sass_plugin_configured = true
config = sass_plugin_configuration
locations = config.delete(:template_location)
Sass::Plugin.options.merge!(config)
locations.each do |sass_dir, css_dir|
- Sass::Plugin.add_template_location sass_dir, css_dir
+ unless Sass::Plugin.engine_options[:load_paths].include?(sass_dir)
+ Sass::Plugin.add_template_location sass_dir, css_dir
+ end
end
- end
-
- def sass_plugin_configured?
- @sass_plugin_configured
end
def sass_engine_options
configuration.to_sass_engine_options
end