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

[duncan at codespeak.net]

Author: duncan
Date: Fri Mar 14 17:16:32 2008
New Revision: 52511

Modified:
   kupu/trunk/kupu/common/kupueditor.js
   kupu/trunk/kupu/doc/CHANGES.txt
Log:
Plone ticket 7916 kupu breaks strong/em tags with class names, on firefox

Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js	(original)
+++ kupu/trunk/kupu/common/kupueditor.js	Fri Mar 14 17:16:32 2008
@@ -705,9 +705,9 @@
         if (!_SARISSA_IS_IE) { /* Mozilla doesn't understand strong/em */
             var fixups = { 'strong':'b', 'em':'i' };
 
-            text = text.replace(/<(\/?)(strong|em)>/gi, function(all,close,tag) {
+            text = text.replace(/<(\/?)(strong|em)\b([^>]*)>/gi, function(all,close,tag,attrs) {
                 tag = fixups[tag.toLowerCase()];
-                return '<'+close+tag+'>';
+                return '<'+close+tag+attrs+'>';
             });
         };
         text = text.replace(/<p>(<hr.*?>)<\/p>/g,'$1');

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri Mar 14 17:16:32 2008
@@ -11,6 +11,7 @@
 
     * 6915 Kupu can't find anchors inside table cells
     * 7893 Workaround for bad KSS form submissions
+    * 7916 Kupu breaks strong/em tags with class names, on firefox
     * 7939 Kupu breaks on Firefox 3.0b4 in OSX
 
 - 1.4.8