Author: agilliland
Date: Fri Jun 15 10:14:18 2007
New Revision: 547745
URL: http://svn.apache.org/viewvc?view=rev&rev=547745
Log:
fix for bug using the xinha editor. we need to properly trim the output from
xinha before it gets submitted because it contains some ugly characters
otherwise.
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp?view=diff&rev=547745&r1=547744&r2=547745
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp Fri Jun 15
10:14:18 2007
@@ -23,7 +23,7 @@
</s:text>
</p>
-<s:form id="entry" action="entryAdd!save">
+<s:form id="entry" action="entryAdd!save" onsubmit="editorCleanup()">
<s:hidden name="weblog" />
<%-- ==================================================================
--%>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp?view=diff&rev=547745&r1=547744&r2=547745
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp Fri Jun
15 10:14:18 2007
@@ -31,7 +31,7 @@
</s:text>
</p>
-<s:form id="entry" action="entryEdit!save">
+<s:form id="entry" action="entryEdit!save" onsubmit="editorCleanup()">
<s:hidden name="weblog" />
<s:hidden name="bean.id" />
Modified:
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp?view=diff&rev=547745&r1=547744&r2=547745
==============================================================================
--- roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp
(original)
+++ roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-text.jsp
Fri Jun 15 10:14:18 2007
@@ -20,7 +20,7 @@
<script type="text/javascript">
<!--
-function postWeblogEntry() {
+function editorCleanup() {
// no-op
}
function changeSize(e, num) {
Modified:
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp?view=diff&rev=547745&r1=547744&r2=547745
==============================================================================
---
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
(original)
+++
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
Fri Jun 15 10:14:18 2007
@@ -18,10 +18,9 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<script type="text/javascript">
-<!--
-function postWeblogEntry() {
- document.weblogEntryFormEx.text.value =
xinha_editors.xe_content.getHTML().trim();
- document.weblogEntryFormEx.summary.value =
xinha_editors.xe_summary.getHTML().trim();
+function editorCleanup() {
+ $('xe_content').value = xinha_editors.xe_content.getHTML().trim();
+ $('xe_summary').value = xinha_editors.xe_summary.getHTML().trim();
}
// (preferably absolute) URL (including trailing slash) where Xinha is
installed
@@ -29,7 +28,6 @@
// And the language we need to use in the editor.
_editor_lang = "en";
--->
</script>
<script type="text/javascript" src='<s:url
value="/roller-ui/authoring/editors/xinha/htmlarea.js" />'></script>
<script type="text/javascript" src='<s:url
value="/roller-ui/authoring/editors/xinha/my_config.js" />'></script>
@@ -42,8 +40,4 @@
<%-- ===================================================================== --%>
<b><s:text name="weblogEdit.summary" /></b><br />
<s:textarea id="xe_summary" name="bean.summary" rows="10" cols="50"
cssStyle="width: 100%" />
-
-
-
-
