1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00

Fixed conflict!

git-svn-id: svn://hamptoncatlin.com/haml/trunk@10 7063305b-7217-0410-af8c-cdc13e5119b9
This commit is contained in:
hcatlin 2006-07-23 13:57:44 +00:00
parent c4ef30d084
commit 5b1819d977

View file

@ -7,7 +7,7 @@ module HAML
@tab_index = ["", " "]
@happy_land = HappyLand.new(@base, @base.assigns)
#pre-build the tab index up to 9
10.times do |num|
20.times do |num|
@tab_index << @tab_index.last + " "
end
end
@ -15,8 +15,12 @@ module HAML
def render(template = "", locals = {})
@result = ""
@to_close_queue = []
#this helps get the right values for helpers.
@base.assigns.each do |key,value|
@base.instance_eval("@#{key} = value")
end
@happy_land.set_locals(locals)
#breakpoint