[kupu-checkins] r52508 - in kupu/trunk/kupu: common doc

[duncan at codespeak.net]

Author: duncan
Date: Fri Mar 14 17:01:44 2008
New Revision: 52508

Modified:
   kupu/trunk/kupu/common/kupubasetools.js
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Plone ticket 6915 Kupu cant find anchors inside table cells

Modified: kupu/trunk/kupu/common/kupubasetools.js
==============================================================================
--- kupu/trunk/kupu/common/kupubasetools.js	(original)
+++ kupu/trunk/kupu/common/kupubasetools.js	Fri Mar 14 17:01:44 2008
@@ -2833,13 +2833,21 @@
     var doc = this.editor.getInnerDocument();
     var body = doc.body;
     var paras = [];
-    for (var node = body.firstChild; node; node = node.nextSibling) {
-        var name = node.nodeName.toLowerCase();
-        var style = name + "|" + node.className;
-        if (style==style1) {
-            paras.push([node,0]);
-        } else if (style==style2) {
-            paras.push([node,1]);
+    var pat = /(.*?)(\|.*|$)/;
+    var tag1 = style1.replace(pat, '$1');
+    var tag2 = style2.replace(pat, '$1');
+    if (tag2 && tag2 != tag1) { tag1 = "*"; }
+    if (tag1) {
+        var nodes = body.getElementsByTagName(tag1);
+        for (var i = 0; i < nodes.length; i++) {
+            var node = nodes[i];
+            var style = node.nodeName.toLowerCase() + "|" + node.className;
+            if (style==style1) {
+                paras.push([node,0]);
+            }
+            if (style==style2) {
+                paras.push([node,1]);
+            }
         }
     }
     return paras;

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri Mar 14 17:01:44 2008
@@ -9,6 +9,7 @@
 
   - Plone tickets
 
+    * 6915 Kupu can't find anchors inside table cells
     * 7893 Workaround for bad KSS form submissions
     * 7939 Kupu breaks on Firefox 3.0b4 in OSX