sync

diff --git a/Roo/htmleditor/FilterBlack.js b/Roo/htmleditor/FilterBlack.js
index b908561..e5d3863 100644 (file)
--- a/Roo/htmleditor/FilterBlack.js
+++ b/Roo/htmleditor/FilterBlack.js
@@ -24,27 +24,15 @@ Roo.htmleditor.FilterBlack = function(cfg)
 
 Roo.extend(Roo.htmleditor.FilterBlack, Roo.htmleditor.Filter,
 {
-Roo.htmleditor.FilterBlack =  {
+    tag : true, // all elements.
     /**
      * @cfg {array} black blacklist of elements
      */
     black : false, // array
     
-    walkWith : function(node, black)
-    {
-        this.black = black;
-        this.walk(node);
-    },
-    
-      
-    walk : function (node)
-    {
-       Roo.htmleditor.Filter.walk.call(this, node, this.black);
      
-    },
-    
     replace : function(n)
     {
         n.parentNode.removeChild(n);
     }
-};
+});

diff --git a/Roo/htmleditor/FilterComment.js b/Roo/htmleditor/FilterComment.js
index b29ff56..02e28cf 100644 (file)
--- a/Roo/htmleditor/FilterComment.js
+++ b/Roo/htmleditor/FilterComment.js
@@ -1,23 +1,20 @@
 /**
- * Filter Comments
- *
- * Remove Comments..
- * 
- * 
- * 
- *
+ * @class Roo.htmleditor.FilterComment
+ * remove comments.
+ * @constructor
+* Run a new Comments Filter
+* @param {Object} config Configuration options
  */
+Roo.htmleditor.FilterComment = function(cfg)
+{
+    this.walk(cfg.node);
+}
 
-Roo.htmleditor.FilterComment =  {
-
-
-    walk : function (node)
-    {
-        Roo.htmleditor.Filter.walk.call(this, node, false);
-     
-    },
+Roo.extend(Roo.htmleditor.FilterComment, Roo.htmleditor.Filter,
+{
+  
     replaceComment : function(n)
     {
-            n.parentNode.removeChild(n);
+        n.parentNode.removeChild(n);
     }
-}
\ No newline at end of file
+});
\ No newline at end of file

diff --git a/Roo/htmleditor/FilterKeepChildren.js b/Roo/htmleditor/FilterKeepChildren.js
index b74027f..3e28c50 100644 (file)
--- a/Roo/htmleditor/FilterKeepChildren.js
+++ b/Roo/htmleditor/FilterKeepChildren.js
@@ -1,23 +1,22 @@
 /**
- *  remove tags but keep children
+ * @class Roo.htmleditor.FilterKeepChildren
+ * remove tags but keep children
+ * @constructor
+ * Run a new Keep Children Filter
+ * @param {Object} config Configuration options
  */
-Roo.htmleditor.FilterKeepChildren =  {
+
+Roo.htmleditor.FilterKeepChildren = function(cfg)
+{
+    Roo.apply(this, cfg);
+    this.walk(cfg.node);
+}
+
+Roo.extend(Roo.htmleditor.FilterKeepChildren, Roo.htmleditor.FilterBlack,
+{
     
-    black : false, // array
-    walkWith : function (node, black)
-    {
-        this.black = black;
-        this.walk(node);
-     
-    },
-    walk : function (node)
-    {
-        Roo.htmleditor.Filter.walk.call(this, node, this.black);
-     
-    },
-    
-     
-    replace : function(n)
+  
+    replaceTag : function(n)
     {
         // walk children...
         for (var i = 0; i < node.childNodes.length; i++) {

diff --git a/Roo/htmleditor/FilterParagraph.js b/Roo/htmleditor/FilterParagraph.js
index c782d96..4b91239 100644 (file)
--- a/Roo/htmleditor/FilterParagraph.js
+++ b/Roo/htmleditor/FilterParagraph.js
@@ -1,23 +1,26 @@
 /**
- * Filter Paragraph
- *
+ * @class Roo.htmleditor.FilterParagraph
  * paragraphs cause a nightmare for shared content - this filter is designed to be called ? at various points when editing
  * like on 'push' to remove the <p> tags and replace them with line breaks.
- * 
- * 
- *
+ * @constructor
+ * Run a new Paragraph Filter
+ * @param {Object} config Configuration options
  */
 
-Roo.htmleditor.FilterParagraph  =  {
+Roo.htmleditor.FilterParagraph = function(cfg)
+{
+    // no need to apply config.
+    this.walk(cfg.node);
+}
+
+Roo.extend(Roo.htmleditor.FilterParagraph, Roo.htmleditor.Filter,
+{
     
-    walk : function (body)
-    {
-        Roo.htmleditor.Filter.walk.call(this, body, 'P');
-     
-    },
      
+    tag : 'P',
+    
      
-    replace : function(node)
+    replaceTag : function(node)
     {
         
         if (node.childNodes.length == 1 &&

diff --git a/Roo/htmleditor/FilterSpan.js b/Roo/htmleditor/FilterSpan.js
index f3ee4f7..8ea28a2 100644 (file)
--- a/Roo/htmleditor/FilterSpan.js
+++ b/Roo/htmleditor/FilterSpan.js
@@ -1,16 +1,24 @@
-
 /**
- *  filter span's with no attributes out..
+ * @class Roo.htmleditor.FilterSpan
+ * filter span's with no attributes out..
+ * @constructor
+ * Run a new Span Filter
+ * @param {Object} config Configuration options
  */
 
-Roo.htmleditor.FilterSpan =  {
+Roo.htmleditor.FilterSpan = function(cfg)
+{
+    // no need to apply config.
+    this.walk(cfg.node);
+}
 
-    walk : function (node)
-    {
-        Roo.htmleditor.Filter.walk.call(this, 'SPAN', true );
+Roo.extend(Roo.htmleditor.FilterSpan, Roo.htmleditor.Filter,
+{
+     
+    tag : 'SPAN',
      
-    },
-    replace : function(node)
+ 
+    replaceTag : function(node)
     {
         if (node.attributes && node.attributes.length > 0) {
             this.walk(node);
@@ -27,4 +35,4 @@ Roo.htmleditor.FilterSpan =  {
      
     }
     
-};
\ No newline at end of file
+});
\ No newline at end of file

diff --git a/Roo/htmleditor/FilterTableWidth.js b/Roo/htmleditor/FilterTableWidth.js
index 200c258..1484642 100644 (file)
--- a/Roo/htmleditor/FilterTableWidth.js
+++ b/Roo/htmleditor/FilterTableWidth.js
@@ -1,23 +1,30 @@
 /**
- *
- * try and remove table width data - as that frequently messes up other stuff.
+ * @class Roo.htmleditor.FilterTableWidth
+  try and remove table width data - as that frequently messes up other stuff.
  * 
  *      was cleanTableWidths.
  *
  * Quite often pasting from word etc.. results in tables with column and widths.
  * This does not work well on fluid HTML layouts - like emails. - so this code should hunt an destroy them..
  *
+ * @constructor
+ * Run a new Table Filter
+ * @param {Object} config Configuration options
  */
 
-Roo.htmleditor.FilterParagraph  =   {
-    
-    walk: function (body)
-    {
-        Roo.htmleditor.Filter.walk.call(this, body, ['TABLE', 'TD', 'TR', 'TH', 'THEAD', 'TBODY' ]); 
-    },
-    
+Roo.htmleditor.FilterTableWidth = function(cfg)
+{
+    // no need to apply config.
+    this.tag = ['TABLE', 'TD', 'TR', 'TH', 'THEAD', 'TBODY' ];
+    this.walk(cfg.node);
+}
+
+Roo.extend(Roo.htmleditor.FilterTableWidth, Roo.htmleditor.Filter,
+{
+     
+     
     
-    replace: function(node) {
+    replaceTag: function(node) {
         
         
       
@@ -50,4 +57,4 @@ Roo.htmleditor.FilterParagraph  =   {
         
         this.walk(node);
     }
-};
\ No newline at end of file
+});
\ No newline at end of file

diff --git a/Roo/htmleditor/FilterWord.js b/Roo/htmleditor/FilterWord.js
index 22ec9f9..abb06ab 100644 (file)
--- a/Roo/htmleditor/FilterWord.js
+++ b/Roo/htmleditor/FilterWord.js
@@ -1,21 +1,29 @@
 /**
- *
+ * @class Roo.htmleditor.FilterWord
  * try and clean up all the mess that Word generates.
  * 
  * This is the 'nice version' - see 'Heavy' that white lists a very short list of elements, and multi-filters 
- *
+ 
+ * @constructor
+ * Run a new Span Filter
+ * @param {Object} config Configuration options
  */
-Roo.htmleditor.FilterWord  =   {
-    
-    walk: function (node)
-    {
-         Roo.htmleditor.Filter.walk.call(this, node, true);
-    },
+
+Roo.htmleditor.FilterWord = function(cfg)
+{
+    // no need to apply config.
+    this.walk(cfg.node);
+}
+
+Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
+{
+    tag: true,
+     
     
     /**
      * Clean up MS wordisms...
      */
-    replace : function(node)
+    replaceTag : function(node)
     {
          
         // no idea what this does - span with text, replaceds with just text.
@@ -54,7 +62,7 @@ Roo.htmleditor.FilterWord  =   {
                 node.removeChild(cn);
                 node.parentNode.insertBefore(cn, node);
                 // move node to parent - and clean it..
-                this.replace(cn);
+                this.replaceTag(cn);
             }
             node.parentNode.removeChild(node);
             /// no need to iterate chidlren = it's got none..

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index c6790cc..f46b5de 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -275428,6 +275428,23 @@
     "tree_children" : [],
     "tree_parent" : []
   },
+  "Roo.htmleditor.FilterBlack" : {
+    "props" : [
+      {
+        "name" : "black",
+        "type" : "array",
+        "desc" : "blacklist of elements",
+        "memberOf" : ""
+      }
+    ],
+    "events" : [],
+    "methods" : [],
+    "isAbstract" : false,
+    "isBuilderTop" : false,
+    "implementations" : [],
+    "tree_children" : [],
+    "tree_parent" : []
+  },
   "Roo.lib" : {
     "props" : [],
     "events" : [],

diff --git a/docs/src/Roo_htmleditor_FilterAttributes.js.html b/docs/src/Roo_htmleditor_FilterAttributes.js.html
index b439036..6c7deff 100644 (file)
--- a/docs/src/Roo_htmleditor_FilterAttributes.js.html
+++ b/docs/src/Roo_htmleditor_FilterAttributes.js.html
@@ -4,8 +4,8 @@
  * @class Roo.htmleditor.FilterAttributes
  * clean attributes and  styles including http:// etc.. in attribute
  * @constructor
- * Create a new Filter.
- * @param {Object} config Configuration options
+* Run a new Attribute Filter
+* @param {Object} config Configuration options
  */
 </span><span class="jsdoc-var">Roo.htmleditor.FilterAttributes </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">cfg</span><span class="jsdoc-syntax">)
 {

diff --git a/docs/src/Roo_htmleditor_FilterBlack.js.html b/docs/src/Roo_htmleditor_FilterBlack.js.html
index b18544f..03c94aa 100644 (file)
--- a/docs/src/Roo_htmleditor_FilterBlack.js.html
+++ b/docs/src/Roo_htmleditor_FilterBlack.js.html
@@ -8,9 +8,28 @@
  *
  */
 
-</span><span class="jsdoc-var">Roo.htmleditor.FilterBlack </span><span class="jsdoc-syntax">=  {
+/**
+ * @class Roo.htmleditor.FilterBlack
+ * remove blacklisted elements.
+ * @constructor
+ * Run a new Blacklisted Filter
+ * @param {Object} config Configuration options
+ */
+
+</span><span class="jsdoc-var">Roo.htmleditor.FilterBlack </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">cfg</span><span class="jsdoc-syntax">)
+{
+    </span><span class="jsdoc-var">Roo.apply</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">cfg</span><span class="jsdoc-syntax">);
+    </span><span class="jsdoc-var">this.walk</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">cfg.node</span><span class="jsdoc-syntax">);
+}
 
+</span><span class="jsdoc-var">Roo.extend</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Roo.htmleditor.FilterBlack</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">Roo.htmleditor.Filter</span><span class="jsdoc-syntax">,
+{
+</span><span class="jsdoc-var">Roo.htmleditor.FilterBlack </span><span class="jsdoc-syntax">=  {
+    </span><span class="jsdoc-comment">/**
+     * @cfg {array} black blacklist of elements
+     */
     </span><span class="jsdoc-var">black </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">, </span><span class="jsdoc-comment">// array
+
     </span><span class="jsdoc-var">walkWith </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">node</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">black</span><span class="jsdoc-syntax">)
     {
         </span><span class="jsdoc-var">this.black </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">black</span><span class="jsdoc-syntax">;

diff --git a/docs/tree.json b/docs/tree.json
index 6cdd724..81b21a7 100644 (file)
--- a/docs/tree.json
+++ b/docs/tree.json
@@ -1314,6 +1314,11 @@
             "name" : "Roo.htmleditor.FilterAttributes",
             "cn" : [],
             "is_class" : false
+          },
+          {
+            "name" : "Roo.htmleditor.FilterBlack",
+            "cn" : [],
+            "is_class" : false
           }
         ],
         "is_class" : false