X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=Roo%2Fhtmleditor%2FFilterWord.js;fp=Roo%2Fhtmleditor%2FFilterWord.js;h=6773e5e63b7f9dfc6437d4d7c1ff2a360a1eea80;hp=64262c08c013ebb48f60434f312b5fbc7a15c7ad;hb=a26a1ebe59567f87f8e12170f62b428a91862f0c;hpb=51ed2845f5c09276c637c52a110fac3756b69493 diff --git a/Roo/htmleditor/FilterWord.js b/Roo/htmleditor/FilterWord.js index 64262c08c0..6773e5e63b 100644 --- a/Roo/htmleditor/FilterWord.js +++ b/Roo/htmleditor/FilterWord.js @@ -134,7 +134,7 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, var kv = s.split(":"); // what ever is left... we allow. - ret[kv[0]] = kv[1]; + ret[kv[0].trim()] = kv[1]; }); return ret; }, @@ -161,7 +161,9 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, var ns = p, parent = p.parentNode, doc = parent.ownerDocument, - items = []; + items = []; + + while (ns) { if (ns.nodeType != 1) { ns = ns.nextSibling; @@ -172,15 +174,16 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, } items.push(ns); ns = ns.nextSibling; - } + + var ul = parent.ownerDocument.createElement('ul'); // what about number lists... parent.insertBefore(ul, p); var lvl = 0; var stack = [ ul ]; var last_li = false; - items.forEach(function(n) { + items.forEach(function(n, ipos) { //Roo.log("got innertHMLT=" + n.innerHTML); var spans = n.getElementsByTagName('span'); @@ -212,18 +215,15 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, return; } - var nlvl = Math.min( - stack.length-1, - (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1 - ); + var nlvl = (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1 ; if (nlvl > lvl) { //new indent - var nul = doc.createElement('ul'); // what about number lists... - last_li.appendChild(nul); - stack[nlvl] = nul; + var nul = doc.createElement('ul'); // what about number lists... + last_li.appendChild(nul); + stack[nlvl] = nul; } lvl = nlvl;