From: Alan Date: Fri, 7 Jan 2022 07:10:08 +0000 (+0800) Subject: Roo/htmleditor/TidyWriter.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=fbfcae6a494866618d15d6bd5e4b5fe10b120961 Roo/htmleditor/TidyWriter.js --- diff --git a/Roo/htmleditor/TidyWriter.js b/Roo/htmleditor/TidyWriter.js index f9fb4cc2bb..e9f75d69d8 100644 --- a/Roo/htmleditor/TidyWriter.js +++ b/Roo/htmleditor/TidyWriter.js @@ -72,8 +72,9 @@ Roo.htmleditor.TidyWriter.prototype = { var is_short = empty ? Roo.htmleditor.TidyWriter.shortend_elements.indexOf(name) > -1 : false; - var i_inline = name == 'BR' ? false : in_inline; - if (i_inline && this.lastElementEndsWS()) { + var add_lb = name == 'BR' ? false : in_inline; + + if (!add_lb && !this.in_pre && this.lastElementEndsWS()) { i_inline = false; } @@ -83,9 +84,19 @@ Roo.htmleditor.TidyWriter.prototype = { // only 'BR' ??? any others? var e_inline = name == 'BR' ? false : this.in_inline; - // if this element is inline - then don't add stuff beforehand.. - if (!e_inline && !this.in_pre) { - this.addLine(); + // ADD LINE BEFORE tage + if (!this.in_pre) { + if (in_inline) { + //code + if (is_br) { + this.addLine(); + } else if (this.lastElementEndsWS()) { + this.addLine(); + } + // otherwise - no new line. + } else { + this.addLine(); + } } this.html.push(indentstr + '<', name.toLowerCase());