X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=docs%2Fsrc%2FRoo_htmleditor_FilterWord.js.html;h=5336910c9204e2953025a0039c55d5679d58e8c9;hb=bb4f20285cb0ce281099e1db5cb76e60175de50f;hp=09720968d4455d253f30a2dc5a66d3ba4867d56c;hpb=dc5e04c8624069261a3fc9c75bfef46a0116c813;p=roojs1 diff --git a/docs/src/Roo_htmleditor_FilterWord.js.html b/docs/src/Roo_htmleditor_FilterWord.js.html index 09720968d4..5336910c92 100644 --- a/docs/src/Roo_htmleditor_FilterWord.js.html +++ b/docs/src/Roo_htmleditor_FilterWord.js.html @@ -14,10 +14,10 @@ // no need to apply config. this.replaceDocBullets(cfg.node); - this.walk(cfg.node); + // this.walk(cfg.node); -} +} Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, { @@ -66,7 +66,10 @@ node.removeChild(cn); node.parentNode.insertBefore(cn, node); // move node to parent - and clean it.. - this.replaceTag(cn); + if (cn.nodeType == 1) { + this.replaceTag(cn); + } + } node.parentNode.removeChild(node); /// no need to iterate chidlren = it's got none.. @@ -122,7 +125,7 @@ styleToObject: function(node) { - var styles = node.getAttribute("style").split(";"); + var styles = (node.getAttribute("style") || '').split(";"); var ret = {}; Roo.each(styles, function(s) { if (!s.match(/:/)) { @@ -139,11 +142,17 @@ replaceDocBullets : function(doc) { + // this is a bit odd - but it appears some indents use ql-indent-1 + + var listpara = doc.getElementsByClassName('ql-indent-1'); + while(listpara.length) { + this.replaceDocBullet(listpara.item(0)); + } + var listpara = doc.getElementsByClassName('MsoListParagraph'); while(listpara.length) { this.replaceDocBullet(listpara.item(0)); - //code - } + } }, replaceDocBullet : function(p) @@ -154,7 +163,11 @@ doc = parent.ownerDocument, items = []; while (ns) { - if (!ns.className.match(/MsoListParagraph/)) { + if (ns.nodeType != 1) { + ns = ns.nextSibling; + continue; + } + if (!ns.className.match(/(MsoListParagraph|ql-indent-1)/i)) { break; } items.push(ns); @@ -167,29 +180,61 @@ var stack = [ ul ]; var last_li = false; items.forEach(function(n) { - parent.removeChild(n); + //Roo.log("got innertHMLT=" + n.innerHTML); + var spans = n.getElementsByTagName('span'); - n.removeChild(spans.item(0)); // remove the fake bullet. - var style = this.styleToObject(n); + if (!spans.length) { + //Roo.log("No spans found"); + + parent.removeChild(n); + return; // skip it... + } + + + + var style = {}; + for(var i = 0; i < spans.length; i++) { + + style = this.styleToObject(spans[i]); + if (typeof(style['mso-list']) == 'undefined') { + continue; + } + + spans[i].parentNode.removeChild(spans[i]); // remove the fake bullet. + break; + } + //Roo.log("NOW GOT innertHMLT=" + n.innerHTML); + style = this.styleToObject(n); // mo-list is from the parent node. + if (typeof(style['mso-list']) == 'undefined') { + //Roo.log("parent is missing level"); + parent.removeChild(n); + return; + } + var nlvl = (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1; - if (nlvl > lvl) { - new indent + if (nlvl > lvl && last_li) { + //new indent var nul = doc.createElement('ul'); // what about number lists... last_li.appendChild(nul); stack[nlvl] = nul; } + lvl = nlvl; - var nli = stack[nlvl].appendChild('li'); + var nli = stack[nlvl].appendChild(doc.createElement('li')); last_li = nli; + nli.innerHTML = n.innerHTML; + //Roo.log("innerHTML = " + n.innerHTML); + parent.removeChild(n); + // copy children of p into nli - while(p.firstChild) { - var fc = p.firstChild; - p.removeChild(fc); - nli.appendChild(fc); - } + /*while(n.firstChild) { + var fc = n.firstChild; + n.removeChild(fc); + nli.appendChild(fc); + }*/ - },this); + },this);