[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kupu-checkins
Subject:    [kupu-checkins] r11481 - in kupu/branch/kupu-1.2: common doc
From:       duncan () codespeak ! net
Date:       2005-04-26 15:38:08
Message-ID: 20050426153808.3F3C227B84 () code1 ! codespeak ! net
[Download RAW message or body]

Author: duncan
Date: Tue Apr 26 17:38:08 2005
New Revision: 11481

Modified:
   kupu/branch/kupu-1.2/common/kupucontentfilters.js
   kupu/branch/kupu-1.2/doc/CHANGES.txt
Log:
Fix for IE duplicating content.

Modified: kupu/branch/kupu-1.2/common/kupucontentfilters.js
==============================================================================
--- kupu/branch/kupu-1.2/common/kupucontentfilters.js	(original)
+++ kupu/branch/kupu-1.2/common/kupucontentfilters.js	Tue Apr 26 17:38:08 2005
@@ -584,9 +584,6 @@
         }
 
         var kids = htmlnode.childNodes;
-        if (kids && /base|meta|link|hr|param|img|area|input|br|basefont|isindex|col/.exec(nodename)) {
-            kids = []; // IE bug: base can think it has children
-        }
         var permittedChildren = this.States[parentnode.tagName] || permitted;
 
         if (kids.length == 0) {
@@ -599,6 +596,15 @@
         } else {
             for (var i = 0; i < kids.length; i++) {
                 var kid = kids[i];
+
+                if (kid.parentNode !== htmlnode) {
+                    if (kid.tagName == 'BODY') {
+                        if (nodename != 'html') continue;
+                    } else if (kid.parentNode.tagName !== htmlnode.tagName) {
+                        continue; // IE bug: nodes appear multiple places
+                    }
+                }
+                
                 if (kid.nodeType == 1) {
                     var newkid = this._convertNodes(ownerdoc, kid, parentnode, permittedChildren);
                     if (newkid != null) {

Modified: kupu/branch/kupu-1.2/doc/CHANGES.txt
==============================================================================
--- kupu/branch/kupu-1.2/doc/CHANGES.txt	(original)
+++ kupu/branch/kupu-1.2/doc/CHANGES.txt	Tue Apr 26 17:38:08 2005
@@ -2,9 +2,19 @@
 Kupu changes
 ============
 
+- 1.2.1
+
+  The following issue has been resolved:
+
+  - 70: Content duplication (when pasting into IE from Microsoft Word or Works).
+
 - 1.2 final
 
   - Linking to the current folder produced an empty link. Now it links to "."
+  - Changed how kupu in Plone handles non-HTML content e.g. STX. Now it won't
+    load for fields in Archetypes content if the content type isn't HTML (but 
+    it does put in a link allowing you to force a conversion). See
+    http://plone.org/collector/3900
 
 - 1.2rc2
 

[prev in list] [next in list] [prev in thread] [next in thread]