From 5ee022a68144963a41439c8f9bb89298b999ac10 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Adrian=20Paca=C5=82a?= Date: Tue, 3 Jun 2008 07:25:36 +0200 Subject: [PATCH] Sass is now compiled when using custom template path. --- merb-haml/lib/merb-haml.rb | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/merb-haml/lib/merb-haml.rb b/merb-haml/lib/merb-haml.rb index f77c0a5..10e9cdf 100644 --- a/merb-haml/lib/merb-haml.rb +++ b/merb-haml/lib/merb-haml.rb @@ -1,20 +1,20 @@ # make sure we're running inside Merb -if defined?(Merb::Plugins) +if defined?(Merb::Plugins) require "haml" require "merb-haml/template" Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks")) Merb::BootLoader.after_app_loads do - if File.directory?(Merb.dir_for(:stylesheet) / "sass") - require "sass/plugin" + if File.directory?(Merb::Config[:sass][:template_location] || Merb.dir_for(:stylesheet) / "sass") + require "sass/plugin" Sass::Plugin.options = Merb::Config[:sass] if Merb::Config[:sass] end end - + # Hack because Haml uses symbolize_keys class Hash def symbolize_keys! self end end -end \ No newline at end of file +end -- 1.5.5.1