Minor relative_assets cleanup
This commit is contained in:
parent
8bf0124241
commit
4a49388d64
1 changed files with 46 additions and 46 deletions
|
@ -1,63 +1,63 @@
|
||||||
# Extension namespace
|
# Extension namespace
|
||||||
module Middleman::Extensions
|
module Middleman
|
||||||
|
module Extensions
|
||||||
|
|
||||||
# Relative Assets extension
|
# Relative Assets extension
|
||||||
module RelativeAssets
|
module RelativeAssets
|
||||||
|
|
||||||
# Setup extension
|
# Setup extension
|
||||||
class << self
|
class << self
|
||||||
|
|
||||||
# Once registered
|
# Once registered
|
||||||
def registered(app)
|
def registered(app)
|
||||||
# Tell compass to use relative assets
|
# Tell compass to use relative assets
|
||||||
app.compass_config do |config|
|
app.compass_config do |config|
|
||||||
config.relative_assets = true
|
config.relative_assets = true
|
||||||
|
end
|
||||||
|
|
||||||
|
# Include instance methods
|
||||||
|
app.send :include, InstanceMethods
|
||||||
end
|
end
|
||||||
|
|
||||||
# Include instance methods
|
alias :included :registered
|
||||||
app.send :include, InstanceMethods
|
|
||||||
end
|
end
|
||||||
|
|
||||||
alias :included :registered
|
|
||||||
end
|
|
||||||
|
|
||||||
# Relative Assets instance method
|
# Relative Assets instance method
|
||||||
module InstanceMethods
|
module InstanceMethods
|
||||||
|
|
||||||
# asset_url override for relative assets
|
# asset_url override for relative assets
|
||||||
# @param [String] path
|
# @param [String] path
|
||||||
# @param [String] prefix
|
# @param [String] prefix
|
||||||
# @return [String]
|
# @return [String]
|
||||||
def asset_url(path, prefix="")
|
def asset_url(path, prefix="")
|
||||||
begin
|
begin
|
||||||
prefix = images_dir if prefix == http_images_path
|
prefix = images_dir if prefix == http_images_path
|
||||||
rescue
|
rescue
|
||||||
end
|
end
|
||||||
|
|
||||||
if path.include?("://")
|
if path.include?("://")
|
||||||
super(path, prefix)
|
super(path, prefix)
|
||||||
elsif path[0,1] == "/"
|
elsif path[0,1] == "/"
|
||||||
path
|
|
||||||
else
|
|
||||||
path = File.join(prefix, path) if prefix.length > 0
|
|
||||||
request_path = @request_path.dup
|
|
||||||
request_path << index_file if path.match(%r{/$})
|
|
||||||
request_path.gsub!(%r{^/}, '')
|
|
||||||
parts = request_path.split('/')
|
|
||||||
|
|
||||||
if parts.length > 1
|
|
||||||
arry = []
|
|
||||||
(parts.length - 1).times { arry << ".." }
|
|
||||||
arry << path
|
|
||||||
File.join(*arry)
|
|
||||||
else
|
|
||||||
path
|
path
|
||||||
|
else
|
||||||
|
path = File.join(prefix, path) if prefix.length > 0
|
||||||
|
|
||||||
|
request_path = @request_path.dup
|
||||||
|
request_path << index_file if path.match(%r{/$})
|
||||||
|
|
||||||
|
parts = request_path.gsub(%r{^/}, '').split('/')
|
||||||
|
|
||||||
|
if parts.length > 1
|
||||||
|
arry = []
|
||||||
|
(parts.length - 1).times { arry << ".." }
|
||||||
|
arry << path
|
||||||
|
File.join(*arry)
|
||||||
|
else
|
||||||
|
path
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Register extension
|
|
||||||
# register :relative_assets, RelativeAssets
|
|
||||||
end
|
end
|
Loading…
Reference in a new issue