You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/10/23 18:27:57 UTC
svn commit: r587549 - in /cocoon/trunk/blocks/cocoon-forms:
cocoon-forms-impl/src/main/resources/COB-INF/
cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/
cocoon-forms-sample/src/main/resources/COB-INF/
Author: felixk
Date: Tue Oct 23 09:27:48 2007
New Revision: 587549
URL: http://svn.apache.org/viewvc?rev=587549&view=rev
Log:
Loading XinhaCore.js causes dojo to fail when the form is being submitted.
Fehler: too much recursion
Quelldatei: http://localhost:8888/cocoon-ajax-impl/resource/external/dojo/dojo.js
Zeile: 96
See also https://issues.apache.org/jira/browse/COCOON-2141
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap?rev=587549&r1=587548&r2=587549&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap Tue Oct 23 09:27:48 2007
@@ -50,7 +50,7 @@
<map:act type="log">
<map:parameter name="level" value="warn"/>
<map:parameter name="console" value="true"/>
- <map:parameter name="message" value="HTMLArea is deprecated. Please use alternatives instead (e.g. Xinha)."/>
+ <map:parameter name="message" value="HTMLArea is deprecated. Please use alternatives instead."/>
</map:act>
<map:read src="resource://org/apache/cocoon/forms/resources/htmlarea/{1}.js" type="servletLinkRewriter"/>
</map:match>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl?rev=587549&r1=587548&r2=587549&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl Tue Oct 23 09:27:48 2007
@@ -29,7 +29,8 @@
<xsl:import href="resource://org/apache/cocoon/forms/resources/forms-field-styling.xsl"/>
<xsl:include href="resource://org/apache/cocoon/forms/resources/forms-calendar-styling.xsl"/>
<xsl:include href="resource://org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl"/>
- <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-xinha-styling.xsl"/>
+ <!-- https://issues.apache.org/jira/browse/COCOON-2141
+ <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-xinha-styling.xsl"/ -->
<xsl:param name="forms-resources"/>
@@ -40,13 +41,15 @@
<script src="{$forms-resources}/mattkruse-lib/OptionTransfer.js" type="text/javascript"/>
<script src="{$forms-resources}/mattkruse-lib/selectbox.js" type="text/javascript"/>
<xsl:apply-templates select="." mode="forms-htmlarea"/>
- <xsl:apply-templates select="." mode="forms-xinha"/>
+ <!-- https://issues.apache.org/jira/browse/COCOON-2141
+ <xsl:apply-templates select="." mode="forms-xinha"/ -->
</xsl:template>
<xsl:template match="body" mode="forms-field">
<xsl:apply-imports/>
<xsl:apply-templates select="." mode="forms-htmlarea"/>
- <xsl:apply-templates select="." mode="forms-xinha"/>
+ <!-- https://issues.apache.org/jira/browse/COCOON-2141
+ <xsl:apply-templates select="." mode="forms-xinha"/ -->
</xsl:template>
<!--+ This template should not be necessary as this stylesheet "inherits"
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml?rev=587549&r1=587548&r2=587549&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/welcome.xml Tue Oct 23 09:27:48 2007
@@ -43,8 +43,9 @@
<sample name="Country selector" href="countryselector">Illustrates programmatically changing flow-jxpath selectionlists.</sample>
<sample name="Upload" href="upload">Shows an upload widget used with Flowscript</sample>
<sample name="Form Model GUI" href="form_model_gui.flow">Illustrates the use of Class, New, Struct, and Union.</sample>
- <sample name="HTMLArea" href="htmlarea">A simple form using the HTML editor widget (deprecated, use alternatives instead, e.g. <a href="xinha">Xinha</a>).</sample>
- <sample name="Xinha" href="xinha">A simple form using the Xinha editor widget.</sample>
+ <sample name="HTMLArea" href="htmlarea">A simple form using the HTML editor widget (deprecated, use alternatives instead).</sample>
+ <!-- https://issues.apache.org/jira/browse/COCOON-2141
+ <sample name="Xinha" href="xinha">A simple form using the Xinha editor widget.</sample -->
<sample name="Aggregate" href="aggregate/example">Aggregate field examples</sample>
<sample name="Multipage wizard" href="do-multipage.flow">(Ajax) A multipage wizard, using widget states and actions to move between pages.</sample>
<sample name="CAPTCHA validation" href="captcha/">CAPTCHA validation (requires <a href="/samples/blocks/batik/">Batik block</a>)</sample>