antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

chg: removed transformation of linebreaks to <br> or <p> elements in format() method

Browse source
This commit is contained in:
Tobi Schäfer 2015-08-10 14:19:57 +02:00
parent ed8f6ce9b6
commit 80dfe53204
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/helma/util/HtmlEncoder.java
View file

@ -563,7 +563,7 @@ public final class HtmlEncoder {
if (entering != INTERNAL && exiting != INTERNAL) { if (entering != INTERNAL && exiting != INTERNAL) {
int swallowBreaks = 0; int swallowBreaks = 0;
if (paragraphs && /*if (paragraphs &&
(entering != BLOCK || exiting != BLOCK) && (entering != BLOCK || exiting != BLOCK) &&
(exiting < BLOCK) && (exiting < BLOCK) &&
(linebreaks > 1) && (linebreaks > 1) &&
@ -571,14 +571,14 @@ public final class HtmlEncoder {
ret.insert(paragraphStart, "<p>"); ret.insert(paragraphStart, "<p>");
ret.append("</p>"); ret.append("</p>");
swallowBreaks = 2; swallowBreaks = 2;
} }*/
// treat entering a SEMIBLOCK as entering a TEXT // treat entering a SEMIBLOCK as entering a TEXT
int _entering = entering == SEMIBLOCK ? TEXT : entering; int _entering = entering == SEMIBLOCK ? TEXT : entering;
for (int k = linebreaks-1; k>=0; k--) { for (int k = linebreaks-1; k>=0; k--) {
if (k >= swallowBreaks && k >= _entering && k >= exiting) { /*if (k >= swallowBreaks && k >= _entering && k >= exiting) {
ret.append("<br />"); ret.append("<br />");
} }*/
ret.append(newLine); ret.append(newLine);
} }
if (exiting >= SEMIBLOCK || linebreaks > 1) { if (exiting >= SEMIBLOCK || linebreaks > 1) {
@ -799,17 +799,17 @@ public final class HtmlEncoder {
// add remaining newlines we may have collected // add remaining newlines we may have collected
int swallowBreaks = 0; int swallowBreaks = 0;
if (paragraphs && entering < BLOCK) { /*if (paragraphs && entering < BLOCK) {
ret.insert(paragraphStart, "<p>"); ret.insert(paragraphStart, "<p>");
ret.append("</p>"); ret.append("</p>");
swallowBreaks = 2; swallowBreaks = 2;
} }*/
if (linebreaks > 0) { if (linebreaks > 0) {
for (int i = linebreaks-1; i>=0; i--) { for (int i = linebreaks-1; i>=0; i--) {
if (i >= swallowBreaks && i > exiting) { /*if (i >= swallowBreaks && i > exiting) {
ret.append("<br />"); ret.append("<br />");
} }*/
ret.append(newLine); ret.append(newLine);
} }
} }