[kupu-checkins] r42099 - in kupu/trunk/kupu: common plone/kupu_plone_layer

[duncan at codespeak.net]

Author: duncan
Date: Mon Apr 16 17:44:47 2007
New Revision: 42099

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
Log:
kupucontentfilters.js, don't strip <br> tag from inside things other than <p> or <div> (e.g. inside <strong> it should be preserved).
Fix import of getToolByName in kupulibraries.xml

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Mon Apr 16 17:44:47 2007
@@ -556,7 +556,7 @@
                 parentNode.appendChild(p);
                 return false;
             }
-            if (!node.nextSibling) return false;
+            if (!node.nextSibling && parentNode.nodeName.test(/p|div/)) return false;
             return true;
         };
     }

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupulibraries.xml.pt	Mon Apr 16 17:44:47 2007
@@ -10,7 +10,7 @@
     >
 
 <tal:with define="
-    getToolByName nocall:modules/Products/kupu/plone/util/getToolByName;
+    getToolByName nocall:modules/Products.kupu.plone.util/getToolByName;
     kupu_tool     python:getToolByName(context, 'kupu_library_tool');
     libraries     python:kupu_tool.getCookedLibraries(context);
     ">