X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=Roo%2Fhtmleditor%2FFilterWord.js;fp=Roo%2Fhtmleditor%2FFilterWord.js;h=ac7fe90131183f950d4e0e944a74c9924563ae6a;hp=a1705af2cb18f15728d137e706737c3e2a7cc1ee;hb=60631b51d5921085aca39ec1a38100bbd2163bd2;hpb=48433e7609936e5bfd69291e107113635d0808b8 diff --git a/Roo/htmleditor/FilterWord.js b/Roo/htmleditor/FilterWord.js index a1705af2cb..ac7fe90131 100644 --- a/Roo/htmleditor/FilterWord.js +++ b/Roo/htmleditor/FilterWord.js @@ -246,14 +246,19 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter, if (!spans.length) { continue; } - var ff = spans[0].style.fontFamily; - if (!spans[0].hasAttribute('style') && spans.length > 1 && spans[1].hasAttribute('style')) { - - ff = spans[1].style.fontFamily; + var ff = ''; + var se = spans[0]; + for (var i = 0; i < spans.length;i++) { + se = spans[i]; + if (se.hasAttribute('style') && se.hasAttribute('style') && se.style.fontFamily != '') { + ff = se.style.fontFamily; + break; + } } - //var style = this.styleToObject(spans[0]); + + //Roo.log("got font family: " + ff); - if (typeof(ff) != 'undefined' && !ff.match(/Symbol/)) { + if (typeof(ff) != 'undefined' && !ff.match(/(Symbol|Wingdings)/) && "·o".indexOf(se.innerText.trim()) < 0) { listtype = 'ol'; }