[kupu-checkins] r37026 - in kupu/trunk/kupu: common doc tests

[yuppie at codespeak.net]

Author: yuppie
Date: Fri Jan 19 18:23:53 2007
New Revision: 37026

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/tests/test_xhtml.js
Log:
- fixed some issues in NonXHTMLTagFilter and XhtmlValidation

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Fri Jan 19 18:23:53 2007
@@ -50,6 +50,7 @@
                             'address': 1,
                             'b': 1,
                             'base': 1,
+                            'big': 1,
                             'blockquote': 1,
                             'br': 1,
                             'caption': 1,
@@ -69,7 +70,6 @@
                             'h4': 1,
                             'h5': 1,
                             'h6': 1,
-                            'h7': 1,
                             'i': 1,
                             'img': 1,
                             'kbd': 1,
@@ -82,6 +82,7 @@
                             'q': 1,
                             'samp': 1,
                             'script': 1,
+                            'small': 1,
                             'span': 1,
                             'strong': 1,
                             'style': 1,
@@ -94,6 +95,7 @@
                             'th': 1,
                             'thead': 1,
                             'tr': 1,
+                            'tt': 1,
                             'ul': 1,
                             'u': 1,
                             'var': 1,
@@ -302,11 +304,11 @@
         this.fontstyle_basic = ['tt','i','b','u','s','strike'];
         this.fontstyle = [].concat(this.fontstyle_basic, this.fontstyle_extra);
         this.phrase_extra = ['sub','sup'];
-        this.phrase_basic=[
-                          'em','strong','dfn','code','q',
-                          'samp','kbd','var', 'cite','abbr','acronym'];
+        this.phrase_basic = ['em','strong','dfn','code','q',
+                             'samp','kbd','var','cite','abbr','acronym'];
+        this.phrase = [].concat(this.phrase_basic, this.phrase_extra);
         this.inline_forms = ['input','select','textarea','label','button'];
-        this.misc_inline = ['ins','del'];
+        this.misc_inline = ['ins','del', 'script'];
         this.misc = ['noscript'].concat(this.misc_inline);
         this.inline = ['a'].concat(this.special, this.fontstyle, this.phrase, this.inline_forms);
 
@@ -318,7 +320,7 @@
         this.block = ['p','div','isindex','fieldset','table'].concat(
                      this.heading, this.lists, this.blocktext);
 
-        this.Flow = ['#PCDATA','form'].concat(this.block, this.inline);
+        this.Flow = ['#PCDATA','form'].concat(this.block, this.inline, this.misc);
     }(this);
 
     this._commonsetting = function(self, names, value) {

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri Jan 19 18:23:53 2007
@@ -4,6 +4,11 @@
 
 - 1.4 Beta 3
 
+  - Fixed NonXHTMLTagFilter default filterdata: 'big', 'small' and 'tt' are
+    valid XHTML tags, 'h7' not.
+
+  - Fixed some small issues in XhtmlValidation elements.
+
   - Fixed a bug where createLink deleted the selected text.
 
   - Paragraph styles may now be replaced as well as added to in a

Modified: kupu/trunk/kupu/tests/test_xhtml.js
==============================================================================
--- kupu/trunk/kupu/tests/test_xhtml.js	(original)
+++ kupu/trunk/kupu/tests/test_xhtml.js	Fri Jan 19 18:23:53 2007
@@ -212,6 +212,30 @@
         this.conversionTest(data, data);
     }
 
+    this.testXHTML10Strict = function() {
+        // Some XHTML 1.0 Strict tags
+        var data = '<hr/>'+
+            '<bdo>bdo</bdo>'+
+            '<big>big</big>'+
+            '<del>del</del>'+
+            '<ins>ins</ins>'+
+            '<small>small</small>'+
+            '<tt>tt</tt>';
+        this.editor.xhtmlvalid.filterstructure = true;
+        this.conversionTest(data, data);
+    };
+
+    this.testXHTML10Transitional = function() {
+        // Some XHTML 1.0 Transitional tags
+        var data = '<dir><li>dir</li></dir>'+
+            '<menu><li>menu</li></menu>'+
+            '<s>s</s>'+
+            '<strike>strike</strike>'+
+            '<basefont size="2"/>';
+        this.editor.xhtmlvalid.filterstructure = true;
+        this.conversionTest(data, data);
+    };
+
     this.tearDown = function() {
         this.body.innerHTML = '';
     };