[kupu-checkins] r46465 - in kupu/trunk/kupu: doc plone/kupu_plone_layer

[duncan at codespeak.net]

Author: duncan
Date: Tue Sep 11 12:15:54 2007
New Revision: 46465

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
Log:
Fix Plone issue 6975: adding newlines to the output HTML had broken the test to convert nearly empty HTML to completely empty.


Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue Sep 11 12:15:54 2007
@@ -2,6 +2,12 @@
 Kupu changes
 ============
 
+- SVN
+
+  - Plone tickets
+
+    * 6975: Cannot save HTML field as NULL
+
 - 1.4.2
 
   - Florian fixed some encoding errors

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	Tue Sep 11 12:15:54 2007
@@ -100,7 +100,7 @@
     // We need to get the contents of the body node as xml, but we don't
     // want the body node itself, so we use a regex to remove it
     var contents = this.getXMLBody(transform);
-    if (/^<body[^>]*>(<\/?(p|br)[^>]*>|\&nbsp;)*<\/body>$/.test(contents)) {
+    if (/^<body[^>]*>(<\/?(p|br)[^>]*>|\&nbsp;|\s)*<\/body>$/.test(contents)) {
         contents = ''; /* Ignore nearly empty contents */
     }
     var base = this._getBase(transform);