r1340 - in xwiki/trunk/src/main: java/com/xpn/xwiki/render/filter web/tiny_mce/plugins/table web/wiki_editor/plugins
Phung Hai Nam
namphunghai at users.forge.objectweb.org
Fri Sep 22 10:19:02 CEST 2006
Author: namphunghai
Date: 2006-09-22 10:19:02 +0200 (Fri, 22 Sep 2006)
New Revision: 1340
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java
xwiki/trunk/src/main/web/tiny_mce/plugins/table/table.htm
xwiki/trunk/src/main/web/wiki_editor/plugins/core.js
Log:
Fixed the bug XWIKI-312 in WYSIWYG editor .
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java 2006-09-21 21:44:14 UTC (rev 1339)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java 2006-09-22 08:19:02 UTC (rev 1340)
@@ -138,7 +138,7 @@
editparams.append("section=").append(sectionNumber);
try {
if ((xcontext.getWiki().isMultiLingual(xcontext)) && (doc.getRealLanguage(xcontext) != null))
- editparams.append("&").append("language=").append(doc.getRealLanguage(xcontext));
+ editparams.append("&language=").append(doc.getRealLanguage(xcontext));
} catch (XWikiException e) { }
String url = doc.getURL("edit", editparams.toString(), xcontext);
Modified: xwiki/trunk/src/main/web/tiny_mce/plugins/table/table.htm
===================================================================
--- xwiki/trunk/src/main/web/tiny_mce/plugins/table/table.htm 2006-09-21 21:44:14 UTC (rev 1339)
+++ xwiki/trunk/src/main/web/tiny_mce/plugins/table/table.htm 2006-09-22 08:19:02 UTC (rev 1340)
@@ -53,17 +53,18 @@
</head>
<body onload="init();">
<form onsubmit="insertTable();return false;">
- <table border="0" cellpadding="0" cellspacing="0" width="200">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
- <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0">
+ <td align="center" valign="middle"><table border="0" cellpadding="4" cellspacing="0" width="100%">
<tr>
<td colspan="4" class="title">{$lang_insert_table_title}</td>
</tr>
+ <tr><td colspan="4"></td></tr>
<tr>
<td>{$lang_insert_table_cols}:</td>
- <td><input name="cols" type="text" id="cols" value="" size="3" maxlength="3"></td>
- <td>{$lang_insert_table_rows}:</td>
- <td><input name="rows" type="text" id="rows" value="" size="3" maxlength="3"></td>
+ <td><input name="cols" type="text" id="cols" value="" size="7" maxlength="3"></td>
+ <td align="center">{$lang_insert_table_rows}:</td>
+ <td><input name="rows" type="text" id="rows" value="" size="7" maxlength="3"></td>
</tr>
<tr id = "align" style="display: none">
<td>{$lang_insert_table_align}:</td>
@@ -86,14 +87,14 @@
<td></td>
</tr>
<tr>
- <td><input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertTable();"></td>
- <td align="right"> </td>
- <td align="right"> </td>
- <td align="right"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
+ <td align="right"><input type="button" id="insert" name="insert" value="{$lang_insert}" onclick="insertTable();"></td>
+ <td colspan="2"> </td>
+ <td align="left"><input type="button" id="cancel" name="cancel" value="{$lang_cancel}" onclick="cancelAction();"></td>
</tr>
</table></td>
</tr>
</table>
</form>
+<hr />
</body>
</html>
Modified: xwiki/trunk/src/main/web/wiki_editor/plugins/core.js
===================================================================
--- xwiki/trunk/src/main/web/wiki_editor/plugins/core.js 2006-09-21 21:44:14 UTC (rev 1339)
+++ xwiki/trunk/src/main/web/wiki_editor/plugins/core.js 2006-09-22 08:19:02 UTC (rev 1340)
@@ -89,7 +89,7 @@
}
this.setHtmlTagRemover('removeHtmlTags_Groovy');
- this.setHtmlTagRemover('removeHtmlTags_Paragraph');
+ this.setHtmlTagRemover('removeSpecialHtmlTags');
// Toolbar handlers
this.addToolbarHandler('handleTextButtons');
this.addToolbarHandler('handleListButtons');
@@ -114,10 +114,14 @@
return str.replace(remove_html_tags_regexp, "");
}
-WikiEditor.prototype.removeHtmlTags_Paragraph = function(str) {
+// This will remove some special Html tags to fix some bugs when switch between text and wysiwyg editor
+// We will replace or remove this method in future when find out the better solutions.
+WikiEditor.prototype.removeSpecialHtmlTags = function(str) {
str = str.replace(/<div class="paragraph">([\s\S]+?)<\/div>/g,'$1');
str = str.replace(/<p class="paragraph">([\s\S]+?)<\/p>/g,'$1');
- str = str.replace(/<p>([\s\S]+?)<\/p>/g,'$1');
+ str = str.replace(/<span class="wikilink">([\s\S]+?)<\/span>/gi,'$1');
+ str = str.replace(/<span class="wikiexternallink">([\s\S]+?)<\/span>/gi,'$1');
+ str = str.replace(/<\/?p[^>]*>/gi, "");
str = str.replace(/<br \/>/g, '\r\n')
return str;
}
More information about the Xwiki-notifications
mailing list