r1563 - in xwiki/trunk/web/standard/src/main/webapp: WEB-INF wiki_editor_2/plugins

[Phung Hai Nam]

Author: namphunghai
Date: 2006-11-15 04:36:18 +0100 (Wed, 15 Nov 2006)
New Revision: 1563

Modified:
   xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki.cfg
   xwiki/trunk/web/standard/src/main/webapp/wiki_editor_2/plugins/core.js
Log:
Fixed a bug in wysiwyg 2.

Modified: xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki.cfg
===================================================================
--- xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki.cfg	2006-11-15 02:26:30 UTC (rev 1562)
+++ xwiki/trunk/web/standard/src/main/webapp/WEB-INF/xwiki.cfg	2006-11-15 03:36:18 UTC (rev 1563)
@@ -75,5 +75,5 @@
 xwiki.section.edit=1
 
 # Editor config
-xwiki.wysiwyg.use_style_toolbar=1
+xwiki.wysiwyg.use_style_toolbar=0
 

Modified: xwiki/trunk/web/standard/src/main/webapp/wiki_editor_2/plugins/core.js
===================================================================
--- xwiki/trunk/web/standard/src/main/webapp/wiki_editor_2/plugins/core.js	2006-11-15 02:26:30 UTC (rev 1562)
+++ xwiki/trunk/web/standard/src/main/webapp/wiki_editor_2/plugins/core.js	2006-11-15 03:36:18 UTC (rev 1563)
@@ -120,8 +120,11 @@
     str = str.replace(/<p class="paragraph">\s*([\s\S]+?)<\/p>/g,'$1');
     str = str.replace(/<span class="wikilink">\s*([\s\S]+?)<\/span>/g,'$1');
     str = str.replace(/<span class="wikiexternallink">\s*([\s\S]+?)<\/span>/g,'$1');
+    str = str.replace(/<span class="bold">([\s\S]+?)<\/span>/g,'$1');
+    str = str.replace(/<span class="italic">([\s\S]+?)<\/span>/g,'$1');
+    str = str.replace(/<span class="strike">([\s\S]+?)<\/span>/g,'$1');    
     str = str.replace(/<\/?p[^>]*>/gi, "");
-    str = str.replace(/<br \/>/g, '\r\n')
+    str = str.replace(/<br \/>/g, '\r\n');
     return str;
 }