roojs-all.js

[roojs1] / roojs-debug.js

diff --git a/roojs-debug.js b/roojs-debug.js
index fb3f291..08eb96e 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -45652,6 +45652,8 @@ Roo.htmleditor.Filter.prototype = {
                     return;
                 
                 case this.tag === true: // everything
+                case e.tagName.indexOf(":") > -1 && typeof(this.tag) == 'object' && this.tag.indexOf(":") > -1:
+                case e.tagName.indexOf(":") > -1 && typeof(this.tag) == 'string' && this.tag == ":":
                 case typeof(this.tag) == 'object' && this.tag.indexOf(e.tagName) > -1: // array and it matches.
                 case typeof(this.tag) == 'string' && this.tag == e.tagName: // array and it matches.
                     if (this.replaceTag && false === this.replaceTag(e)) {
@@ -46076,11 +46078,11 @@ Roo.extend(Roo.htmleditor.FilterTableWidth, Roo.htmleditor.Filter,
 
 Roo.htmleditor.FilterWord = function(cfg)
 {
-    console.log("FilterWord definition");
     // no need to apply config.
     this.replaceDocBullets(cfg.node);
     
-   this.walk(cfg.node);
+    // this is disabled as the removal is done by other filters;
+   // this.walk(cfg.node);
     
     
 }
@@ -46096,7 +46098,6 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
     replaceTag : function(node)
     {
          
-        console.log("FilterWord replaceTag");
         // no idea what this does - span with text, replaceds with just text.
         if(
                 node.nodeName == 'SPAN' &&
@@ -50285,7 +50286,7 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
             });
             new Roo.htmleditor.FilterBlack({ node : d, tag : this.black});
             // should be fonts..
-            new Roo.htmleditor.FilterKeepChildren({node : d, tag : [ 'FONT', 'O:P' ]} );
+            new Roo.htmleditor.FilterKeepChildren({node : d, tag : [ 'FONT', ':' ]} );
             new Roo.htmleditor.FilterParagraph({ node : d });
             new Roo.htmleditor.FilterSpan({ node : d });
             new Roo.htmleditor.FilterLongBr({ node : d });
@@ -50974,8 +50975,8 @@ Roo.extend(Roo.HtmlEditorCore, Roo.Component,  {
      */
     cleanWord : function(node)
     {
-        console.log("HtmlEditorCore cleanWord");
         new Roo.htmleditor.FilterWord({ node : node ? node : this.doc.body });
+        new Roo.htmleditor.FilterKeepChildren({node : node ? node : this.doc.body, tag : [ 'FONT', ':' ]} );
         
     },
    
@@ -52339,7 +52340,6 @@ Roo.form.HtmlEditor.ToolbarStandard.prototype = {
                 actiontype : 'word',
                 html: 'Remove MS Word Formating',
                 handler: function(a,b) {
-                    console.log("ToolbarStandard Handler");
                     editorcore.cleanWord();
                     editorcore.syncValue();
                 },