r1084 - xwiki/trunk/src/main/web/wiki_editor/plugins

[Phung Hai Nam]

Author: namphunghai
Date: 2006-06-05 09:17:51 +0200 (Mon, 05 Jun 2006)
New Revision: 1084

Modified:
   xwiki/trunk/src/main/web/wiki_editor/plugins/core.js
Log:
Fixed bug XWIKI-176 "Image in Table is not reconverted to WYSIWYG properly" ,
Must be convert external image inside the table  before convert table

Modified: xwiki/trunk/src/main/web/wiki_editor/plugins/core.js
===================================================================
--- xwiki/trunk/src/main/web/wiki_editor/plugins/core.js	2006-06-02 11:31:18 UTC (rev 1083)
+++ xwiki/trunk/src/main/web/wiki_editor/plugins/core.js	2006-06-05 07:17:51 UTC (rev 1084)
@@ -27,6 +27,9 @@
     this.addExternalProcessor((/\[(.*?)(>(.*?))?\]/i), 'convertLinkExternal');
 	this.addInternalProcessor((/<a\s*([^>]*)(class=\"wikiexternallink\"|class=\"wikilink\")\s*([^>]*)>(.*?)<\/a>/i), 'convertLinkInternal');
 
+    // Must convert external images inside table before convert the table
+    this.addExternalProcessor((/{\s*image\s*:\s*(.*?)(\|(.*?))?(\|(.*?))?}/i), 'convertImageExternal');
+
     this.addExternalProcessor((/{table}([\s\S]+?){table}/i), 'convertTableExternal');
     this.addInternalProcessor((/<table\s*([^>]*)class=\"wiki-table\"\s*([^>]*)>([\s\S]+?)<\/table>/i), 'convertTableInternal');