make template an instance variable for helpers to use
This commit is contained in:
parent
e6caece1c7
commit
8606943a19
1 changed files with 4 additions and 4 deletions
|
@ -72,20 +72,20 @@ class Middleman < Sinatra::Base
|
||||||
get /(.*)/ do |path|
|
get /(.*)/ do |path|
|
||||||
path << "index.html" if path.match(%r{/$})
|
path << "index.html" if path.match(%r{/$})
|
||||||
path.gsub!(%r{^/}, '')
|
path.gsub!(%r{^/}, '')
|
||||||
template = path.gsub(File.extname(path), '').to_sym
|
@template = path.gsub(File.extname(path), '').to_sym
|
||||||
@full_request_path = path
|
@full_request_path = path
|
||||||
|
|
||||||
result = nil
|
result = nil
|
||||||
|
|
||||||
%w(haml erb builder maruku mab sass).each do |renderer|
|
%w(haml erb builder maruku mab sass).each do |renderer|
|
||||||
next if !File.exists?(File.join(options.views, "#{template}.#{renderer}"))
|
next if !File.exists?(File.join(options.views, "#{@template}.#{renderer}"))
|
||||||
|
|
||||||
renderer = "markaby" if renderer == "mab"
|
renderer = "markaby" if renderer == "mab"
|
||||||
result = if renderer == "sass"
|
result = if renderer == "sass"
|
||||||
content_type 'text/css', :charset => 'utf-8'
|
content_type 'text/css', :charset => 'utf-8'
|
||||||
sass(template, Compass.sass_engine_options)
|
sass(@template, Compass.sass_engine_options)
|
||||||
else
|
else
|
||||||
send(renderer.to_sym, template)
|
send(renderer.to_sym, @template)
|
||||||
end
|
end
|
||||||
|
|
||||||
break
|
break
|
||||||
|
|
Loading…
Reference in a new issue