Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Blanklines: Revert pre changes, add testcases #74

Merged
merged 1 commit into from
Feb 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/compress.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,9 @@
{% if _pres.size != 0 %}
{% if site.compress_html.blanklines %}
{% assign _lines = _pres.last | split: _LINE_FEED %}
{% assign _lastchar = _pres.last | split: "" | last %}
{% assign _outerloop = forloop %}
{% capture _pres_after %}
{% for _line in _lines %}
{% assign _trimmed = _line | split: " " | join: " " %}
{% if forloop.last and _lastchar == _LINE_FEED %}
{% unless _outerloop.last %}
{{ _LINE_FEED }}
{% endunless %}
{% continue %}
{% endif %}
{% if _trimmed != empty or forloop.last %}
{% unless forloop.first %}
{{ _LINE_FEED }}
Expand Down
4 changes: 3 additions & 1 deletion test/expected/blanklines/blanklines.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@
</pre><pre>

</pre>
<pre>
<span>Text</span>
<pre>


</pre>
</body>
</html>

3 changes: 3 additions & 0 deletions test/expected/blanklines/prepre.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div>
TEXT<pre></pre><pre></pre>
</div>
3 changes: 3 additions & 0 deletions test/source/blanklines/blanklines.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@

</pre>



<span>Text</span>



Expand Down
12 changes: 12 additions & 0 deletions test/source/blanklines/prepre.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
layout: compress
---

<div>

TEXT
<pre></pre>

<pre></pre>

</div>