You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jb...@apache.org on 2006/04/03 15:46:57 UTC
svn commit: r391045 - in /cocoon: branches/BRANCH_2_1_X/status.xml
trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/resources/forms-page-styling.xsl
Author: jbq
Date: Mon Apr 3 06:46:54 2006
New Revision: 391045
URL: http://svn.apache.org/viewcvs?rev=391045&view=rev
Log:
Fix COCOON-1809 patched by Rob Berens
Modified:
cocoon/branches/BRANCH_2_1_X/status.xml
cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/resources/forms-page-styling.xsl
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=391045&r1=391044&r2=391045&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Apr 3 06:46:54 2006
@@ -181,6 +181,9 @@
<release version="@version@" date="@date@">
-->
<release version="2.1.9" date="TBD">
+ <action dev="JBQ" type="add" fixes-bug="COCOON-1809" due-to="Rob Berens" due-to-email="rberens@osirion.nl">
+ CForms: Added event handling for group of type "choice" (allow formsOnShow attribute)
+ </action>
<action dev="JBQ" type="add" fixes-bug="COCOON-1808" due-to="Rob Berens" due-to-email="rberens@osirion.nl">
CForms: Added method StaticSelectionList.addItem(Object value, String label)
</action>
Modified: cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/resources/forms-page-styling.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/resources/forms-page-styling.xsl?rev=391045&r1=391044&r2=391045&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/resources/forms-page-styling.xsl (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/resources/forms-page-styling.xsl Mon Apr 3 06:46:54 2006
@@ -101,26 +101,10 @@
</div>
<!-- The tabbed elements can have an attribute formsOnShow containing some javascript to be executed
when a tab gets shown. -->
- <script type="text/javascript">
- if (window.onTabShownHandlers == undefined)
- window.onTabShownHandlers = new Object();
- var currentHandlers = new Object();
- var initialHandler = null;
- window.onTabShownHandlers["<xsl:value-of select="$id"/>"] = currentHandlers;
- <xsl:for-each select="fi:items/fi:*">
- <xsl:variable name="pos" select="position() - 1"/>
- <xsl:if test="@formsOnShow">
- currentHandlers["<xsl:value-of select="concat($id, '_items_', $pos)"/>"] = "<xsl:value-of select="@formsOnShow"/>";
- <xsl:if test="$active = $pos">
- initialHandler = "<xsl:value-of select="@formsOnShow"/>";
- </xsl:if>
- </xsl:if>
- </xsl:for-each>
- if (initialHandler != null) {
- eval(initialHandler);
- initialHandler = null;
- }
- </script>
+ <xsl:call-template name="formsOnShow">
+ <xsl:with-param name="id" select="$id"/>
+ <xsl:with-param name="active" select="$active"/>
+ </xsl:call-template>
</xsl:template>
<!--
@@ -189,6 +173,35 @@
</div>
</xsl:for-each>
</fieldset>
+ <xsl:call-template name="formsOnShow">
+ <xsl:with-param name="id" select="$id"/>
+ <xsl:with-param name="active" select="$active"/>
+ </xsl:call-template>
+ </xsl:template>
+
+ <xsl:template name="formsOnShow">
+ <xsl:param name="id"/>
+ <xsl:param name="active"/>
+ <script type="text/javascript">
+ if (window.onTabShownHandlers == undefined)
+ window.onTabShownHandlers = new Object();
+ var currentHandlers = new Object();
+ var initialHandler = null;
+ window.onTabShownHandlers["<xsl:value-of select="$id"/>"] = currentHandlers;
+ <xsl:for-each select="fi:items/fi:*">
+ <xsl:variable name="pos" select="position() - 1"/>
+ <xsl:if test="@formsOnShow">
+ currentHandlers["<xsl:value-of select="concat($id, '_items_', $pos)"/>"] = "<xsl:value-of select="@formsOnShow"/>";
+ <xsl:if test="$active = $pos">
+ initialHandler = "<xsl:value-of select="@formsOnShow"/>";
+ </xsl:if>
+ </xsl:if>
+ </xsl:for-each>
+ if (initialHandler != null) {
+ eval(initialHandler);
+ initialHandler = null;
+ }
+ </script>
</xsl:template>
<!--