X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fhtmleditor%2FTidyWriter.js;h=575efdc3625914d4347b2bc132345cbfe46345bc;hb=b85f624217edf58108ae121a01b6d0e9a7d613b5;hp=d09f094f09474564ddf12f807574fda941f6c365;hpb=fcc5e3bdb42b8b25bc8b5b1b847a9b1ce5b855a2;p=roojs1 diff --git a/Roo/htmleditor/TidyWriter.js b/Roo/htmleditor/TidyWriter.js index d09f094f09..575efdc362 100644 --- a/Roo/htmleditor/TidyWriter.js +++ b/Roo/htmleditor/TidyWriter.js @@ -2,6 +2,12 @@ * This is based loosely on tinymce * @class Roo.htmleditor.TidyWriter * https://github.com/thorn0/tinymce.html/blob/master/tinymce.html.js + * + * Known issues? + * - not tested much with 'PRE' formated elements. + * - long text inside of inline can be wrapped and clened? + * + * */ Roo.htmleditor.TidyWriter = function(settings) @@ -66,11 +72,16 @@ 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; - var indentstr = in_inline || this.in_pre ? '' : this.indentstr; + var indentstr = in_inli_inlineine || this.in_pre ? '' : this.indentstr; + + // e_inline = elements that can be inline, but still allow \n before and after? + // 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 (!in_inline && !this.in_pre) { + if (!e_inline && !this.in_pre) { this.addLine(); } @@ -89,8 +100,9 @@ Roo.htmleditor.TidyWriter.prototype = { } else { this.html[this.html.length] = '>'; } + var e_inline = name == 'BR' ? false : this.in_inline; - if (!this.in_inline && !this.in_pre) { + if (!e_inline && !this.in_pre) { this.addLine(); } return;