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

Fixed bug where multiline parsing conflicted with filters.

Browse source 
git-svn-id: svn://hamptoncatlin.com/haml/trunk@366 7063305b-7217-0410-af8c-cdc13e5119b9
This commit is contained in:
nex3 2007-02-11 07:23:26 +00:00
parent 71397ced0c
commit d524e6619f
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/haml/engine.rb
View file

@ -210,7 +210,7 @@ END
if old_line if old_line
block_opened = tabs > old_tabs && !line.empty? block_opened = tabs > old_tabs && !line.empty?
suppress_render = handle_multiline(old_tabs, old_line, old_index) suppress_render = handle_multiline(old_tabs, old_line, old_index) unless @flat_spaces != -1
if !suppress_render if !suppress_render
line_empty = old_line.empty? line_empty = old_line.empty?

3
test/haml/results/whitespace_handling.xhtml
View file

@ -95,6 +95,9 @@ foo

<div class='foo'> <div class='foo'>
13 13
</div> </div>
<pre>
__ ______ __ ______&#x000A;.----.| |--.|__ |.----.| |--..--------.| __ |&#x000A;| __|| ||__ || __|| < | || __ |&#x000A;|____||__|__||______||____||__|__||__|__|__||______|&#x000A;
</pre>
<pre> <pre>
foo&#x000A; foo&#x000A;
bar bar

6
test/haml/templates/whitespace_handling.haml
View file

@ -125,6 +125,12 @@
%strong indeed! %strong indeed!
.foo .foo
= find_and_preserve(13) = find_and_preserve(13)
%pre
:preserve
__ ______ __ ______
.----.| |--.|__ |.----.| |--..--------.| __ |
| __|| ||__ || __|| < | || __ |
|____||__|__||______||____||__|__||__|__|__||______|
%pre %pre
:preserve :preserve
foo foo