lib/middleman/features/relative_assets.rb in middleman-0.11.5 vs lib/middleman/features/relative_assets.rb in middleman-0.12.0.pre
- old
+ new
@@ -1,12 +1,24 @@
-::Compass.configuration do |config|
- config.relative_assets = true
+class Middleman::Base
+ after_feature_init do
+ ::Compass.configuration do |config|
+ config.relative_assets = Proc.new do
+ Middleman::Base.respond_to?(:relative_assets?) && Middleman::Base.relative_assets?
+ end
+ end
+
+ ::Compass.configure_sass_plugin!
+ end
end
class << Middleman::Base
alias_method :pre_relative_asset_url, :asset_url
def asset_url(path, prefix="", request=nil)
+ if !self.respond_to?(:relative_assets?) || !self.relative_assets?
+ return pre_relative_asset_url(path, prefix, request)
+ end
+
begin
prefix = self.images_dir if prefix == self.http_images_path
rescue
end
@@ -24,10 +36,9 @@
if parts.length > 1
arry = []
(parts.length - 1).times { arry << ".." }
arry << path
File.join(*arry)
- #"../" * (parts.length - 1) + path
else
path
end
end
end
\ No newline at end of file