richfaces-svn-commits
June 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 337 discussions
JBoss Rich Faces SVN: r14744 - branches/community/3.3.X/docs/common-resources/en/src/main/xslt.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-06-29 11:19:54 -0400 (Mon, 29 Jun 2009)
New Revision: 14744
Modified:
branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl
branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
Log:
https://jira.jboss.org/jira/browse/RF-5525 - adding release versions
Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl
===================================================================
--- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl 2009-06-29 15:16:23 UTC (rev 14743)
+++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/f.xsl 2009-06-29 15:19:54 UTC (rev 14744)
@@ -44,7 +44,8 @@
<xsl:template match="/f:template/f:verbatim"/-->
-
+
+
<xsl:template match="javaee:taglib | taglib">
<xsl:variable name="excluded-tag-names">
header2,header3,header4,header5,header6
@@ -101,16 +102,16 @@
<emphasis role="since">
<superscript>
<xsl:choose>
- <xsl:when test="document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.desc.xml'))/node()/section/sectioninfo/releaseinfo">
+ <xsl:when test="document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.desc.xml'))/section/sectioninfo/releaseinfo">
<xsl:text> available since </xsl:text>
<emphasis role="version">
- <xsl:value-of select="."/>
+ <xsl:value-of select="document(concat($lang, $separator, 'included', $separator, $prefix, '_', $tag_name, '.desc.xml'))/section/sectioninfo/releaseinfo"/>
</emphasis>
</xsl:when>
- <xsl:when test="document(concat($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/root/section/sectioninfo/releaseinfo">
+ <xsl:when test="document(concat($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/section/sectioninfo/releaseinfo">
<xsl:text> available since </xsl:text>
<emphasis role="version">
- <xsl:value-of select="."/>
+ <xsl:value-of select="document(concat($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/section/sectioninfo/releaseinfo"/>
</emphasis>
</xsl:when>
<xsl:otherwise>
Modified: branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
===================================================================
--- branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-06-29 15:16:23 UTC (rev 14743)
+++ branches/community/3.3.X/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-06-29 15:19:54 UTC (rev 14744)
@@ -171,6 +171,7 @@
<!--xsl:template name="since" match="//emphasis[@role='since']" /-->
+<xsl:template match="releaseinfo" mode="titlepage.mode" />
<xsl:template name="head.content">
<xsl:param name="node" select="."/>
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14743 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-06-29 11:16:23 -0400 (Mon, 29 Jun 2009)
New Revision: 14743
Modified:
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/ajaxValidator.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/beanValidator.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/calendar.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/changeExpandListener.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/columns.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/dragListener.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/dropListener.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/editor.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/effect.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/extendedDataTable.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/graphValidator.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/hotKey.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/inplaceInput.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/inplaceSelect.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/insert.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/message.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/messages.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/nodeSelectListener.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenuGroup.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenuItem.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/pickList.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/queue.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/recursiveTreeNodesAdaptor.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/toolTip.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml
Log:
https://jira.jboss.org/jira/browse/RF-5525 - adding release versions
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/ajaxValidator.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/ajaxValidator.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/ajaxValidator.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:ajaxValidator</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.2</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/beanValidator.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/beanValidator.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/beanValidator.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:beanValidator</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.2</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/calendar.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/calendar.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/calendar.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:calendar</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/changeExpandListener.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/changeExpandListener.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/changeExpandListener.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:changeExpandListener</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/columns.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/columns.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/columns.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:columns</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/comboBox.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:comboBox</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/dragListener.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/dragListener.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/dragListener.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:dragListener</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/dropListener.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/dropListener.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/dropListener.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:dropListener</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/editor.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/editor.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/editor.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -4,8 +4,9 @@
<keywordset>
<keyword>editor</keyword>
<keyword>rich:editor</keyword>
- </keywordset>
- </sectioninfo>
+ </keywordset>
+ <releaseinfo>3.3.0</releaseinfo>
+</sectioninfo>
<section>
<title>Description</title>
<para>The <emphasis role="bold">
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/effect.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/effect.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/effect.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:effect</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/extendedDataTable.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/extendedDataTable.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/extendedDataTable.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -10,7 +10,8 @@
<sectioninfo>
<keywordset>
<keyword>&extDataTable;</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.2</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -4,7 +4,8 @@
<keywordset>
<keyword>fileUpload</keyword>
<keyword>rich:fileUpload</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
@@ -40,4 +41,4 @@
</itemizedlist>
</section>
</section>
-
\ No newline at end of file
+
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/graphValidator.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/graphValidator.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/graphValidator.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:graphValidator</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.2</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/hotKey.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/hotKey.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/hotKey.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -4,7 +4,8 @@
<keywordset>
<keyword>hotKey</keyword>
<keyword>rich:hotKey</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.2</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
@@ -46,4 +47,4 @@
</itemizedlist>
</section>
</section>
-
\ No newline at end of file
+
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/inplaceInput.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/inplaceInput.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/inplaceInput.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -4,7 +4,8 @@
<keywordset>
<keyword>inplaceInput</keyword>
<keyword>rich:inplaceInput</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
@@ -46,4 +47,4 @@
</listitem>
</itemizedlist>
</section>
-</section>
\ No newline at end of file
+</section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/inplaceSelect.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/inplaceSelect.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/inplaceSelect.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:inplaceSelect</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
@@ -46,4 +47,4 @@
</listitem>
</itemizedlist>
</section>
-</section>
\ No newline at end of file
+</section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/insert.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/insert.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/insert.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:insert</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/message.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/message.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/message.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:message</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/messages.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/messages.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/messages.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:messages</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/nodeSelectListener.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/nodeSelectListener.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/nodeSelectListener.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:nodeSelectListener</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:panelMenu</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenuGroup.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenuGroup.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenuGroup.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:panelMenuGroup</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenuItem.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenuItem.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/panelMenuItem.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:panelMenuItem</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/pickList.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/pickList.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/pickList.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:pickList</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
@@ -44,4 +45,4 @@
</itemizedlist>
</section>
</section>
-
\ No newline at end of file
+
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:progressBar</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.2.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
@@ -32,4 +33,4 @@
</itemizedlist>
</section>
-</section>
\ No newline at end of file
+</section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/queue.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/queue.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/queue.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter role="new">
- <section>
+<section>
<sectioninfo>
<keywordset>
<keyword>a4j:queue</keyword>
- </keywordset>
- </sectioninfo>
+ </keywordset>
+ <releaseinfo>3.3.0</releaseinfo>
+ </sectioninfo>
+ <section>
<title>Description</title>
<para>
The <emphasis role="bold"><property><a4j:queue></property></emphasis> component enqueues set of Ajax requests sent from client.
- The <emphasis role="bold"><property><a4j></property></emphasis> or <emphasis role="bold"><property><rich></property></emphasis> components with built-in Ajax can reference the queue to optimize Ajax requests.
- </para>
-
+ The RichFaces components with built-in Ajax can reference the queue to optimize Ajax requests.
+ </para>
</section>
-</chapter>
\ No newline at end of file
+</section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/recursiveTreeNodesAdaptor.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/recursiveTreeNodesAdaptor.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/recursiveTreeNodesAdaptor.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:recursiveTreeNodesAdaptor</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:scrollableDataTable</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/toolTip.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/toolTip.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/toolTip.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:toolTip</keyword>
-</keywordset>
+</keywordset>
+<releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
@@ -27,4 +28,4 @@
<listitem><para>Disablement support</para></listitem>
</itemizedlist>
</section>
-</section>
\ No newline at end of file
+</section>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:treeNodesAdaptor</keyword>
- </keywordset>
+ </keywordset>
+ <releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml 2009-06-29 14:23:11 UTC (rev 14742)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml 2009-06-29 15:16:23 UTC (rev 14743)
@@ -3,7 +3,8 @@
<sectioninfo>
<keywordset>
<keyword>rich:virtualEarth</keyword>
-</keywordset>
+</keywordset>
+<releaseinfo>3.1.0</releaseinfo>
</sectioninfo>
<section>
<title>Description</title>
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14742 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-29 10:23:11 -0400 (Mon, 29 Jun 2009)
New Revision: 14742
Modified:
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/columns.xml
Log:
https://jira.jboss.org/jira/browse/RF-6853 - updating the link to the 'Sorting and filtering' section;
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/columns.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/columns.xml 2009-06-29 14:21:37 UTC (rev 14741)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/columns.xml 2009-06-29 14:23:11 UTC (rev 14742)
@@ -327,8 +327,8 @@
- <para> Information about sorting and filtering you can find <link
- linkend="sortAndFilter"> in the corresponding section</link>. </para>
+ <para>Sorting and filtering for the <emphasis role="bold"><property><rich:columns></property></emphasis> component works the same
+ as for <emphasis role="bold"><property><rich:column></property></emphasis>. See the <link linkend="sortAndFilter">"Sorting and Filtering"</link> section.</para>
</section>
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14741 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-06-29 10:21:37 -0400 (Mon, 29 Jun 2009)
New Revision: 14741
Modified:
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/column.xml
Log:
https://jira.jboss.org/jira/browse/RF-6853 - updating the 'Sorting' section;
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/column.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/column.xml 2009-06-28 12:44:25 UTC (rev 14740)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/column.xml 2009-06-29 14:21:37 UTC (rev 14741)
@@ -215,7 +215,7 @@
can find additional information about dynamic columns.</para>
</section>
- <section>
+ <section id="sortAndFilter">
<title>Sorting and Filtering</title>
<section id="sort">
<title>Sorting</title>
@@ -394,6 +394,13 @@
<para> In the example above the first column is sorted in descending
order. But if recurring rows appear in the table the
relative second column are sorted in ascending order. </para>
+
+ <para>If the values of the columns are complex, the <emphasis>
+ <property>"sortOrder"</property>
+ </emphasis> attribute should point to a bean property containing the sort order.
+ See how it's done in the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/columns.jsf?c=columns...">LiveDemo</ulink>
+ for <emphasis role="bold"><property><rich:columns></property></emphasis>.</para>
+
<para>You can customize the sorting's icon element using
"rich-sort-icon" class.</para>
<note>
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14740 - branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-06-28 08:44:25 -0400 (Sun, 28 Jun 2009)
New Revision: 14740
Modified:
branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages/index.jsp
Log:
dropDownMenu: menuGroupItem is displayed incorrectly with attribute disabled="true"
https://jira.jboss.org/jira/browse/RF-7383
Modified: branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages/index.jsp
===================================================================
--- branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages/index.jsp 2009-06-28 12:41:36 UTC (rev 14739)
+++ branches/community/3.3.X/samples/dropdownmenu-sample/src/main/webapp/pages/index.jsp 2009-06-28 12:44:25 UTC (rev 14740)
@@ -22,6 +22,30 @@
<h:selectOneRadio binding="#{skinBean.component}"/>
<h:commandLink action="#{skinBean.change}" value="set skin"/>
+ <!-- Start
+ dropDownMenu: menuGroupItem is displayed incorrectly with attribute disabled="true"
+ https://jira.jboss.org/jira/browse/RF-7383
+ -->
+ <ddm:dropDownMenu value="my Menu" id="m">
+ <mc:menuItem value="1"/>
+ <mc:menuItem value="2"/>
+ <mc:menuGroup disabled="true" value="3" id="g">
+ <mc:menuItem value="3.1" />
+ <mc:menuItem value="3.2" />
+ <mc:menuItem value="3.3" />
+ </mc:menuGroup>
+ <mc:menuGroup disabled="false" value="4" id="g2">
+ <mc:menuItem value="4.1" />
+ <mc:menuItem value="4.2" />
+ <mc:menuItem value="4.3" />
+ </mc:menuGroup>
+ <mc:menuItem value="5" />
+ </ddm:dropDownMenu>
+ <!-- End
+ dropDownMenu: menuGroupItem is displayed incorrectly with attribute disabled="true"
+ https://jira.jboss.org/jira/browse/RF-7383
+ -->
+
<h:panelGrid id="grid" columns="2" cellspacing="4">
<ddm:dropDownMenu event="#{bean.event}" id="MenuItem1"
verticalOffset="#{bean.verticalOffset}"
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14739 - in branches/community/3.3.X/ui/menu-components/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-06-28 08:41:36 -0400 (Sun, 28 Jun 2009)
New Revision: 14739
Modified:
branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java
branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
Log:
dropDownMenu: menuGroupItem is displayed incorrectly with attribute disabled="true"
https://jira.jboss.org/jira/browse/RF-7383
Modified: branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java 2009-06-28 11:19:18 UTC (rev 14738)
+++ branches/community/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererDelegate.java 2009-06-28 12:41:36 UTC (rev 14739)
@@ -59,10 +59,11 @@
String selectedLabelClass = (String) menuItem.getAttributes().get("labelClass");
if (disabled) {
+ variables.setVariable("menuGroupClass", concatClasses("rich-menu-group rich-menu-group-disabled", itemClass, disabledItemClass, styleClass));
+ variables.setVariable("menuGroupItemIconClass", "rich-menu-item-icon-disabled rich-menu-group-icon");
variables.setVariable("menuItemClass", concatClasses("rich-menu-item rich-menu-item-disabled", styleClass, itemClass, disabledItemClass));
variables.setVariable("menuItemStyle", concatStyles(itemStyle, disabledItemStyle, style));
variables.setVariable("menuItemLabelClass", concatClasses("rich-menu-item-label rich-menu-item-label-disabled", labelClass, disabledLabelClass));
- variables.setVariable("menuGroupClass", concatClasses("rich-menu-group rich-menu-group-disabled", itemClass, disabledItemClass, styleClass));
variables.setVariable("menuItemMouseMove", "");
variables.setVariable("menuItemItemIconClass", "rich-menu-item-icon-disabled");
variables.setVariable("menuItemItemLabelClass", concatClasses("rich-menu-item-label-disabled", labelClass));
Modified: branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
===================================================================
--- branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2009-06-28 11:19:18 UTC (rev 14738)
+++ branches/community/3.3.X/ui/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2009-06-28 12:41:36 UTC (rev 14739)
@@ -21,20 +21,36 @@
<f:call name="initializeResources" />
<f:call name="initializeStyleClasses" />
<f:resource name="/org/richfaces/renderkit/html/images/spacer.gif" var="spacer" />
-
+
+ <jsp:scriptlet>
+ <![CDATA[
+ boolean disabled = ((Boolean) component.getAttributes().get("disabled")).booleanValue();
+ if (disabled) {
+ ]]>
+ </jsp:scriptlet>
+ <div id="#{clientId}"
+ class="#{menuGroupClass}"
+ style="#{menuItemStyle}"
+ onmousemove="#{menuItemMouseMove}" >
+ <jsp:scriptlet>
+ <![CDATA[} else {]]>
+ </jsp:scriptlet>
+ <div id="#{clientId}"
+ class="#{menuGroupClass}"
+ style="#{menuItemStyle}"
+ onmousemove="#{menuItemMouseMove}"
+ onmouseout="RichFaces.Menu.groupMouseOut(event, this, '#{menuGroupCustomClass}', '#{onmouseoutInlineStyles}');"
+ onmouseover="RichFaces.Menu.groupMouseOver(event, this, '#{menuGroupHoverClass}', '#{onmouseoverInlineStyles}');">
+ <jsp:scriptlet>
+ <![CDATA[}]]>
+ </jsp:scriptlet>
+
+
- <div id="#{clientId}"
- class="#{menuGroupClass}"
- style="#{menuItemStyle}"
- onmousemove="#{menuItemMouseMove}"
- onmouseout="RichFaces.Menu.groupMouseOut(event, this, '#{menuGroupCustomClass}', '#{onmouseoutInlineStyles}');"
- onmouseover="RichFaces.Menu.groupMouseOver(event, this, '#{menuGroupHoverClass}', '#{onmouseoverInlineStyles}');">
-
<span id="#{clientId}:icon"
class="#{menuGroupItemIconClass} #{component.attributes['iconClass']}">
<jsp:scriptlet>
<![CDATA[
- boolean disabled = ((Boolean) component.getAttributes().get("disabled")).booleanValue();
String iconName = disabled ? "iconDisabled" : "icon";
UIComponent iconFacet = component.getFacet(iconName);
if (iconFacet !=null && iconFacet.isRendered()) {
@@ -91,6 +107,18 @@
<jsp:scriptlet>
<![CDATA[}]]>
</jsp:scriptlet>
- </div>
+ <jsp:scriptlet>
+ <![CDATA[if (disabled) {]]>
+ </jsp:scriptlet>
+ </div>
+ <jsp:scriptlet>
+ <![CDATA[} else {]]>
+ </jsp:scriptlet>
+ </div>
+ <jsp:scriptlet>
+ <![CDATA[}]]>
+ </jsp:scriptlet>
+
+
</f:root>
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14738 - branches/community/3.3.X/ui/panelmenu/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-06-28 07:19:18 -0400 (Sun, 28 Jun 2009)
New Revision: 14738
Modified:
branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml
Log:
https://jira.jboss.org/jira/browse/RF-7390
panelMenu: There are some problems with icons
Modified: branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml
===================================================================
--- branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml 2009-06-26 22:06:14 UTC (rev 14737)
+++ branches/community/3.3.X/ui/panelmenu/src/main/config/component/panelMenu.xml 2009-06-28 11:19:18 UTC (rev 14738)
@@ -100,7 +100,7 @@
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".
</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconExpandedGroup</name>
@@ -108,7 +108,7 @@
<description>Path to the icon to be displayed for the expanded Group state.
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconCollapsedGroup</name>
@@ -116,7 +116,7 @@
<description>Path to the icon to be displayed for the collapsed Group state.
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconDisabledGroup</name>
@@ -124,7 +124,7 @@
<description>Path to the icon to be displayed for the disabled group state.
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconExpandedTopGroup</name>
@@ -132,7 +132,7 @@
<description>Path to the icon to be displayed for the expanded top group state.
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconCollapsedTopGroup</name>
@@ -140,7 +140,7 @@
<description>Path to the icon to be displayed for the collapsed top group state.\
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconTopDisableGroup</name>
@@ -149,7 +149,7 @@
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".
</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconItemPosition</name>
@@ -414,7 +414,7 @@
<description>Path to the icon to be displayed for the expanded item state.
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconCollapsed</name>
@@ -422,7 +422,7 @@
<description>Path to the icon to be displayed for the collapsed item state.
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>expanded</name>
@@ -434,7 +434,7 @@
<name>iconDisabled</name>
<classname>java.lang.String</classname>
<description>Path to the icon to be displayed for the disabled item state.</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>disabled</name>
@@ -584,7 +584,7 @@
Default value is "grid".
</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>iconDisabled</name>
@@ -592,9 +592,8 @@
<description>Path to the icon to be displayed for the disabled item state.
You can also use predefined icons, setting the attribute to one of these possible values: "triangle", "triangleUp", "triangleDown", "disc", "chevron", "chevronUp", "chevronDown", "grid".
Default value is "grid".
-
</description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
+ <defaultvalue><![CDATA["grid"]]></defaultvalue>
</property>
<property>
<name>disabled</name>
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14737 - branches/enterprise.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-06-26 18:06:14 -0400 (Fri, 26 Jun 2009)
New Revision: 14737
Added:
branches/enterprise/3.3.X/
Log:
3.3.1.GA tag copied into branches/enterprise/3.3.X
Copied: branches/enterprise/3.3.X (from rev 14736, tags/3.3.1.GA)
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14736 - in branches/community/3.3.X/ui: inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-06-26 14:23:44 -0400 (Fri, 26 Jun 2009)
New Revision: 14736
Modified:
branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
branches/community/3.3.X/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
branches/community/3.3.X/ui/inplaceInput/src/main/templates/inplaceinput.jspx
branches/community/3.3.X/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
branches/community/3.3.X/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
branches/community/3.3.X/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js
branches/community/3.3.X/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
branches/community/3.3.X/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java
Log:
RF-7443
Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2009-06-26 18:23:44 UTC (rev 14736)
@@ -28,8 +28,12 @@
var listOptions = options.listOptions || {};
listOptions.listWidth = listOptions.listWidth || this.getCurrentWidth();
- this.comboList = new Richfaces.ComboBoxList(id, this.filterNewValues, this.classes.combolist, listOptions);
-
+ this.comboList = new Richfaces.ComboBoxList(id, this.filterNewValues, this.classes.combolist, listOptions, "comboboxField");
+ if (Richfaces.browser.isIE6) {
+ this.comboList.createIframe(this.comboList.listParent.parentNode, this.comboList.listWidth, id,
+ "rich-combobox-list-width rich-combobox-list-scroll rich-combobox-list-position");
+ }
+
if (options.value) {
var item = this.comboList.findItemBySubstr(options.value);
if (item) {
Modified: branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
===================================================================
--- branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2009-06-26 18:23:44 UTC (rev 14736)
@@ -9,18 +9,15 @@
showDelay : 0,
hideDelay : 0,
- initialize: function(id, filterNewValues, classes, options) {
+ initialize: function(id, filterNewValues, classes, options, fieldElemIdSuffix) {
Object.extend(this, options);
this.list = document.getElementById(id + "list");
this.listParent = $(id + "listParent");
this.listParentContainer = this.listParent.parentNode;
this.iframe = null;
- this.fieldElem = document.getElementById(id + "comboboxField");
- //this.itemsText = itemsText || [];
+ this.fieldElem = document.getElementById(id + fieldElemIdSuffix);
this.shadowElem = document.getElementById(id + "shadow");
- //this.onlistcall = onlistcall;
- //this.onlistclose = onlistclose;
if (this.onlistcall) {
this.listParent.observe("rich:onlistcall", this.onlistcall);
@@ -40,19 +37,11 @@
this.selectedItem = null;
this.activeItem = null;
- //this.showDelay = showDelay;
- //this.hideDelay = hideDelay;
this.classes = classes;
- //this.listWidth = width;
- //this.listHeight = height;
this.initDimensions();
this.scrollElements = null;
this.eventOnScroll = this.eventOnScroll.bindAsEventListener(this);
- if (Richfaces.browser.isIE6) {
- this.createIframe(this.listParent.parentNode, this.listWidth, id,
- "rich-combobox-list-width rich-combobox-list-scroll rich-combobox-list-position");
- }
},
initDimensions : function() {
Modified: branches/community/3.3.X/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- branches/community/3.3.X/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2009-06-26 18:23:44 UTC (rev 14736)
@@ -7,7 +7,9 @@
Richfaces.InplaceInput.prototype = {
- //TODO: remove $$$$$
+ commonStyles : new Richfaces.InplaceInputStyles().getCommonStyles(),
+
+ //TODO: remove $$$$$
initialize: function(clientId, options) {
if(!options) {
options = {};
@@ -46,7 +48,7 @@
this.initHandlers();
this.initEvents();
- this.classes = Richfaces.mergeStyles(options.userStyles,new Richfaces.InplaceInputStyles().getCommonStyles());
+ this.classes = Richfaces.mergeStyles(options.userStyles, this.commonStyles);
this["rich:destructor"] = "destroy";
this.skipSwitching = false;
Modified: branches/community/3.3.X/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- branches/community/3.3.X/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2009-06-26 18:23:44 UTC (rev 14736)
@@ -16,8 +16,8 @@
new org.ajax4jsf.javascript.PrototypeScript(),
scripts/comboboxUtils.js,
scripts/utils.js,
- scripts/inplaceinput.js,
- scripts/inplaceinputstyles.js
+ scripts/inplaceinputstyles.js,
+ scripts/inplaceinput.js
</h:scripts>
<f:resource var="saveIcon" name="org.richfaces.renderkit.html.images.SaveControlIcon"/>
<f:resource var="cancelIcon" name="org.richfaces.renderkit.html.images.CancelControlIcon"/>
Modified: branches/community/3.3.X/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
===================================================================
--- branches/community/3.3.X/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2009-06-26 18:23:44 UTC (rev 14736)
@@ -164,35 +164,14 @@
}
}
- public String encodeScriptAttributes(FacesContext context, UIComponent component) {
- StringBuilder attributes = new StringBuilder();
- attributes.append("var attributes = ");
+ public String getDefaultLabel(FacesContext context, UIComponent component) {
+ String defaultLabel = (String)component.getAttributes().get("defaultLabel");
+ if (defaultLabel == null || defaultLabel.trim().equals("")) {
+ defaultLabel = EMPTY_DEFAULT_LABEL;
+ }
+ return defaultLabel;
+ }
- ScriptOptions options = new ScriptOptions(component);
-
- String defaultLabel = (String)component.getAttributes().get("defaultLabel");
-
- if (defaultLabel == null || defaultLabel.trim().equals("")) {
- defaultLabel = EMPTY_DEFAULT_LABEL;
- }
-
- options.addOption("defaultLabel", defaultLabel);
- options.addOption("showControls");
- options.addOption("editEvent");
- options.addOption("verticalPosition", component.getAttributes().get("controlsVerticalPosition"));
- options.addOption("horizontalPosition", component.getAttributes().get("controlsHorizontalPosition"));
- options.addOption("inputWidth",component.getAttributes().get("selectWidth") );
- options.addOption("minInputWidth", component.getAttributes().get("minSelectWidth"));
- options.addOption("maxInputWidth", component.getAttributes().get("maxSelectWidth") );
- options.addOption("openOnEdit");
- options.addOption("showValueInView");
- options.addOption("closeOnSelect", true);
-
- attributes.append(options.toScript());
-
- return attributes.toString();
- }
-
public void encodeControlsFacet(FacesContext context, UIComponent component) throws IOException {
UIComponent facet = component.getFacet(CONTROLS_FACET);
if ((facet != null) && (facet.isRendered())) {
@@ -234,15 +213,6 @@
// return selectedItemLabel;
// }
- public String getAsEventHandler(FacesContext context, UIComponent component, String attributeName) {
- JSFunctionDefinition script = getUtils().getAsEventHandler(context, component, attributeName, null);
- return ScriptUtils.toScript(script);
- }
-
- public String encodeJS(Object object) {
- return ScriptUtils.toScript(object);
- }
-
protected String getItemLabel(FacesContext context, UIInplaceSelect component, Object value) {
String itemLabel = null;
boolean equivValues;
Modified: branches/community/3.3.X/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js
===================================================================
--- branches/community/3.3.X/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselect.js 2009-06-26 18:23:44 UTC (rev 14736)
@@ -1,12 +1,25 @@
if(!window.Richfaces) window.Richfaces = {};
Richfaces.InplaceSelect = Class.create(Richfaces.InplaceInput, {
- initialize : function($super, listObj, clientId, temValueKeepId, valueKeepId, tabberId, attributes, events, userStyles, commonStyles, barParams, buttonId) {
- this.button = $(buttonId);
- this.comboList = listObj;
- this.showValueInView = attributes.showValueInView;
- $super(clientId, temValueKeepId, valueKeepId, tabberId, attributes, events, userStyles, commonStyles, barParams);
+ commonStyles : new Richfaces.InplaceSelectStyles().getCommonStyles(),
+
+ initialize : function($super, id, options) {
+ options = options || {};
+ this.button = $(id + "inselArrow");
+ this.showValueInView = options.showValueInView;
+ var attributes = {
+ minInputWidth : "100px",
+ maxInputWidth : "200px",
+ openOnEdit : true
+ };
+ Object.extend(attributes, options.attributes);
+ options.attributes = attributes;
+ this.classes = Richfaces.mergeStyles(options.userStyles, this.commonStyles);
+ var listOptions = options.listOptions || {};
+ listOptions.selectFirstOnUpdate = true;
+ this.comboList = new Richfaces.InplaceSelectList(id, this.classes.combolist, listOptions, "tempValue", options.fieldValue);
+ $super(id, options);
this.clickOnBar = false;
- this.inplaceSelect = $(clientId);
+ this.inplaceSelect = $(id);
this.inplaceSelect.component = this;
this.currentItemValue = this.value;
@@ -168,7 +181,7 @@
save : function($super,e) {
this.applyTmpValue();
this.comboList.hide();
- if (((this.attributes.closeOnSelect && !this.attributes.showControls) && this.comboList.isList)
+ if ((!this.attributes.showControls && this.comboList.isList)
|| (this.clickOnBar || !this.comboList.isList)) {
var unescapedValue = this.currentItemValue;
this.setValue(unescapedValue);
Modified: branches/community/3.3.X/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js
===================================================================
--- branches/community/3.3.X/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceselectlist.js 2009-06-26 18:23:44 UTC (rev 14736)
@@ -1,8 +1,10 @@
if(!window.Richfaces) window.Richfaces = {};
Richfaces.InplaceSelectList = Class.create(Richfaces.ComboBoxList, {
- initialize : function($super, listId, parentListId, selectFirstOnUpdate, userStyles, commonStyles, width, height, itemsText, onlistcall, fieldId, shadowId, showDelay, hideDelay, value) {
- this.classes = Richfaces.mergeStyles(userStyles, commonStyles);
- $super(listId, parentListId, selectFirstOnUpdate, null, this.classes, width, height, itemsText, onlistcall, null /* onlistclose */, fieldId, shadowId, showDelay, hideDelay);
+
+ listWidth : "200px",
+
+ initialize : function($super, id, classes, options, fieldElemIdSuffix, value) {
+ $super(id, null, classes, options, fieldElemIdSuffix);
this.wrappingItems(value);
this.isListOpened = false;
},
@@ -12,7 +14,7 @@
field.show();
if (Richfaces.browser.isIE6 && !this.iframe) {
- this.createIframe(this.listParent.parentNode, this.width, this.list.id, "");
+ this.createIframe(this.listParent.parentNode, this.listWidth, this.list.id, "");
}
$super(fieldTop, fieldLeft, field.offsetHeight);
Modified: branches/community/3.3.X/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
===================================================================
--- branches/community/3.3.X/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/inplaceSelect/src/main/templates/inplaceselect.jspx 2009-06-26 18:23:44 UTC (rev 14736)
@@ -19,10 +19,11 @@
/org/richfaces/renderkit/html/scripts/jquery/jquery.js,
scripts/comboboxUtils.js ,
scripts/combolist.js ,
+ scripts/inplaceinputstyles.js,
scripts/inplaceinput.js ,
+ scripts/inplaceselectstyles.js,
scripts/inplaceselectlist.js,
scripts/inplaceselect.js,
- scripts/inplaceselectstyles.js,
/org/richfaces/renderkit/html/scripts/utils.js
</h:scripts>
@@ -69,12 +70,9 @@
fieldInputLabel = fieldLabel;
}
- String encodedFieldValue = encodeJS(fieldValue);
-
variables.setVariable("fieldLabel", fieldLabel);
variables.setVariable("fieldValue", fieldValue);
variables.setVariable("fieldInputLabel", fieldInputLabel);
- variables.setVariable("encodedFieldValue", encodedFieldValue);
String saveIcon = (String)component.getAttributes().get("saveControlIcon");
if (saveIcon != null && saveIcon.length() != 0 ) {
@@ -99,15 +97,15 @@
String changedClass = (String)component.getAttributes().get("changedClass");
changedClass = (changedClass != null ? changedClass.trim() : "") + " " + styleClass;
- variables.setVariable("changedClass", changedClass);
+ variables.setVariable("changedClass", changedClass.trim());
String viewClass = (String)component.getAttributes().get("viewClass");
viewClass = (viewClass != null ? viewClass.trim() : "") + " " + styleClass;
- variables.setVariable("viewClass", viewClass);
+ variables.setVariable("viewClass", viewClass.trim());
String editClass = (String)component.getAttributes().get("editClass");
editClass = (editClass != null ? editClass.trim() : "") + " " + styleClass;
- variables.setVariable("editClass", editClass);
+ variables.setVariable("editClass", editClass.trim());
String layout = (String)component.getAttributes().get("layout");
@@ -135,7 +133,7 @@
<jsp:scriptlet>
}
</jsp:scriptlet>
- <input id="#{clientId}inplaceTmpValue"
+ <input id="#{clientId}tempValue"
type="text"
style='clip:rect(0px 0px 0px 0px)'
value="#{fieldInputLabel}"
@@ -159,7 +157,7 @@
/>
<input id="#{clientId}inselArrow" readonly="readonly" type="text" value="" class="rich-inplace-select-arrow" style='display:none;'/>
- <input autocomplete="off" id='#{clientId}inplaceValue' name='#{clientId}' type='hidden' value='#{fieldValue}'
+ <input autocomplete="off" id='#{clientId}value' name='#{clientId}' type='hidden' value='#{fieldValue}'
onchange='#{component.attributes["onchange"]}'>
</input>
<div id="#{clientId}bar" class="rich-inplace-select-control-set" style="display:none;">
@@ -247,38 +245,49 @@
</div>
+ <c:scriptObject var="attributes">
+ <c:scriptOption name="defaultLabel" value="#{this:getDefaultLabel(context, component)}" defaultValue="\u00a0\u00a0\u00a0" />
+ <c:scriptOption attributes="showControls" />
+ <c:scriptOption attributes="editEvent" defaultValue="onclick"/>
+ <c:scriptOption name="verticalPosition" value="#{component.attributes['controlsVerticalPosition']}" defaultValue="center" />
+ <c:scriptOption name="horizontalPosition" value="#{component.attributes['controlsHorizontalPosition']}" defaultValue="right" />
+ <c:scriptOption name="inputWidth" value="#{component.attributes['selectWidth']}" />
+ <c:scriptOption name="minInputWidth" value="#{component.attributes['minSelectWidth']}" defaultValue="100px" />
+ <c:scriptOption name="maxInputWidth" value="#{component.attributes['maxSelectWidth']}" defaultValue="200px" />
+ <c:scriptOption attributes="openOnEdit" defaultValue="true"/>
+ </c:scriptObject>
+ <c:scriptObject var="events">
+ <c:scriptOption attributes="oneditactivation, onviewactivation, oneditactivated, onviewactivated, onchange" wrapper="eventHandler" />
+ </c:scriptObject>
+ <c:scriptObject var="view">
+ <c:scriptOption name="normal" value="#{viewClass}" />
+ <c:scriptOption name="hovered" value="#{component.attributes['viewHoverClass']}" />
+ </c:scriptObject>
+ <c:scriptObject var="changed">
+ <c:scriptOption name="normal" value="#{changedClass}" />
+ <c:scriptOption name="hovered" value="#{component.attributes['changedHoverClass']}" />
+ </c:scriptObject>
+ <c:scriptObject var="componentStyles">
+ <c:scriptOption variables="view, changed" />
+ <c:scriptOption name="editable" value="#{editClass}" />
+ </c:scriptObject>
+ <c:scriptObject var="userStyles">
+ <c:scriptOption name="component" value="#{componentStyles}" />
+ </c:scriptObject>
+ <c:scriptObject var="listOptions">
+ <c:scriptOption attributes="listWidth, listHeight" defaultValue="200px"/>
+ <c:scriptOption name="itemsText" value="#{preparedItems}" />
+ </c:scriptObject>
+ <c:scriptObject var="options">
+ <c:scriptOption attributes="showValueInView" />
+ <c:scriptOption variables="attributes, events, userStyles, fieldValue, listOptions" />
+ </c:scriptObject>
<script type="text/javascript">
- #{this:encodeScriptAttributes(context, component)};
-
- var inplaceSelectUserStyles = {
-
- combolist: {
- list: { classes: {active:'#{listClass}'}},
- item: { normal:'#{itemClass}', selected:'#{itemSelectedClass}'}
- },
-
- component: {
- changed :{normal:'#{changedClass}' ,hovered:'#{component.attributes["changedHoverClass"]}'},
- view : {normal:'#{viewClass}',hovered:'#{component.attributes["viewHoverClass"]}'},
- editable:'#{editClass}'
- }
- };
-
- var inplaceSelectCommonStyles = new Richfaces.InplaceSelectStyles();
-
- new Richfaces.InplaceSelect(new Richfaces.InplaceSelectList('#{clientId}list', '#{clientId}listParent', true,
- inplaceSelectUserStyles.combolist, inplaceSelectCommonStyles.getCommonStyles().combolist, '#{component.attributes["listWidth"]}', '#{component.attributes["listHeight"]}', #{this:encodeJS(preparedItems)}, null,
- '#{clientId}inplaceTmpValue', '#{clientId}shadow', 0, 0, #{encodedFieldValue}),
- '#{clientId}', '#{clientId}inplaceTmpValue',
- '#{clientId}inplaceValue', '#{clientId}tabber',
- attributes,
- {oneditactivation : #{this:getAsEventHandler(context, component, "oneditactivation")},
- onviewactivation : #{this:getAsEventHandler(context, component, "onviewactivation")},
- oneditactivated : #{this:getAsEventHandler(context, component, "oneditactivated")},
- onviewactivated : #{this:getAsEventHandler(context, component, "onviewactivated")},
- onchange : #{this:getAsEventHandler(context, component, "onchange")}},
- inplaceSelectUserStyles, inplaceSelectCommonStyles,
- ['#{clientId}bar', '#{clientId}ok', '#{clientId}cancel', '#{clientId}buttons', '#{clientId}btns_shadow'], '#{clientId}inselArrow');
+ new Richfaces.InplaceSelect('#{clientId}'
+ <c:if test="#{not empty options}">
+ , <f:writeAsScript value="#{options}" />
+ </c:if>
+ );
</script>
</div>
Modified: branches/community/3.3.X/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java 2009-06-26 17:10:37 UTC (rev 14735)
+++ branches/community/3.3.X/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java 2009-06-26 18:23:44 UTC (rev 14736)
@@ -58,6 +58,7 @@
javaScripts.add("scripts/comboboxUtils.js");
javaScripts.add("scripts/combolist.js");
javaScripts.add("scripts/inplaceinput.js");
+ javaScripts.add("scripts/inplaceinputstyles.js");
javaScripts.add("scripts/inplaceselectlist.js");
javaScripts.add("scripts/inplaceselectstyles.js");
javaScripts.add("scripts/inplaceselect.js");
@@ -135,9 +136,7 @@
String srcAttr = item.getSrcAttribute();
if (item.getFirstDomChild() != null) {
String scriptBodyString = item.getFirstDomChild().toString();
- assertTrue(scriptBodyString.contains("Richfaces.InplaceSelectList"));
assertTrue(scriptBodyString.contains("Richfaces.InplaceSelect"));
- assertTrue(scriptBodyString.contains("inplaceSelectUserStyles"));
}
if (StringUtils.isNotBlank(srcAttr)) {
boolean found = false;
14 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r14735 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2009-06-26 13:10:37 -0400 (Fri, 26 Jun 2009)
New Revision: 14735
Modified:
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/jsFunction.desc.xml
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/jsFunction.xml
Log:
RF-7426: a4j:jsFunction component description review
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/jsFunction.desc.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/jsFunction.desc.xml 2009-06-26 15:43:13 UTC (rev 14734)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/jsFunction.desc.xml 2009-06-26 17:10:37 UTC (rev 14735)
@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter>
- <section>
- <sectioninfo>
- <keywordset>
- <keyword>a4j:jsFunction</keyword>
- </keywordset>
- </sectioninfo>
-
- <title>Description</title>
- <para>
- The <emphasis role="bold">
- <property><a4j:jsFunction></property>
- </emphasis> component allows to invoke the server-side data and return it in a JSON format to use in a client JavaScript calls.
- </para>
- </section>
+ <section>
+ <sectioninfo>
+ <keywordset>
+ <keyword>a4j:jsFunction</keyword>
+ </keywordset>
+ </sectioninfo>
+
+ <title>Description</title>
+ <para>
+ The <emphasis role="bold"><property><a4j:jsFunction></property></emphasis> component allows to perform Ajax requests directly from JavaScript code, invoke server-side data and return it in a JSON format to use in a client JavaScript calls.
+ </para>
+ </section>
</chapter>
\ No newline at end of file
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/jsFunction.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/jsFunction.xml 2009-06-26 15:43:13 UTC (rev 14734)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/jsFunction.xml 2009-06-26 17:10:37 UTC (rev 14735)
@@ -36,28 +36,26 @@
</table>
<section>
- <title>Creating on a page</title>
- <para>Simple component definition example:</para>
-
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
- <programlisting role="XML"><![CDATA[...
-<head>
- <script>
- <!--There is some script named "myScript" that uses parameters which will be taken from server-->
- </script>
+ <title>Creating the Component with a Page Tag</title>
+ <para>To create the simpliest example of the component on the page use the following syntax:</para>
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+ <programlisting role="XML"><![CDATA[<head>
+ <script>
+ <!--There is some script named "myScript" that uses parameters which will be taken from server-->
+ </script>
</head>
<body>
- ...
- <a4j:jsFunction data="#{bean.someProperty}" name="callScript" oncomplete="myScript(data.subProperty1, data.subProperty2)"/>
- ...
-</body>
-...]]>
- </programlisting>
- <para> The script <code>"myScript"</code> is called after
- <code>bean.someProperty</code> data is returned from server(e.g. It'll
- be object with two subproperties). </para>
+ ...
+ <a4j:jsFunction data="#{bean.someProperty}" name="callScript" oncomplete="myScript(data.subProperty1, data.subProperty2)"/>
+ ...
+</body>]]>
+
+ </programlisting>
+ <para>
+ The script <code>"myScript"</code> is called after <code>bean.someProperty</code> data is returned from server (e.g. It'll be object with two subproperties).
+ </para>
</section>
<section>
<title>Creating the Component Dynamically Using Java</title>
@@ -71,71 +69,56 @@
...]]></programlisting>
</section>
<section>
- <title>Key attributes and ways of usage</title>
- <para> As the component uses Ajax request to get data from server - it has all common Ajax
- Action attributes. Hence, <emphasis><property>"action"</property></emphasis> and<emphasis><property> "actionListener" </property></emphasis>can be invoked, and reRendering some parts of
+ <title>Details of usage</title>
+
+ <para>
+ As the component uses Ajax request to get data from server it has all common Ajax Action attributes.
+ Hence, <emphasis><property>"action"</property></emphasis> and<emphasis><property> "actionListener" </property></emphasis>can be invoked, and reRendering some parts of
the page fired after calling function. </para>
<para> When using the <emphasis role="bold">
<property><a4j:jsFunction></property>
</emphasis> it's possible to initiate the Ajax request from the JavaScript and
perform partial update of a page and/or invoke the JavaScript function with data returned by
Ajax response. </para>
- <programlisting role="XML"><![CDATA[...
-<body onload="callScript()">
- ...
- <h:form>
- ...
- <a4j:jsFunction name="callScript" data="#{bean.someProperty1}"
- reRender="someComponent" oncomplete="myScript(data.subProperty1, data.subProperty2)">
- <a4j:actionparam name="param_name" assignTo="#{bean.someProperty2}"/>
- </a4j:jsFunction>
- ...
- </h:form>
- ...
-</body>
-...]]></programlisting>
- <para> The <emphasis role="bold">
- <property><a4j:jsFunction></property>
- </emphasis> allows to use <emphasis role="bold">
- <property><a4j:actionparam></property>
- </emphasis> or pure <emphasis role="bold">
- <property><f:param></property>
- </emphasis> for passing any number of parameters of the JavaScript function into Ajax request.
- <emphasis role="bold">
- <property><a4j:jsFunction></property>
- </emphasis> is similar to <emphasis role="bold">
- <property><a4j:commandButton></property>
- </emphasis>, but it could be activated from the JavaScript code. It allows to invoke some
- server-side functionality and use the returned data in the JavaScript function invoked from
- <emphasis><property>"oncomplete"</property></emphasis> attribute. Hence it's possible to use <emphasis
- role="bold">
- <property><a4j:jsFunction></property>
- </emphasis> instead of <emphasis role="bold">
- <property><a4j:commandButton></property>
- </emphasis>. You can put it anywhere, just don't forget to use
- <emphasis role="bold"><property><h:form></property></emphasis>... <emphasis role="bold"><property></h:form></property></emphasis> around it. </para>
+ <programlisting role="XML"><![CDATA[<body onload="callScript()">
+ <h:form>
+ ...
+ <a4j:jsFunction name="callScript" data="#{bean.someProperty1}" reRender="someComponent" oncomplete="myScript(data.subProperty1, data.subProperty2)">
+ <a4j:actionparam name="param_name" assignTo="#{bean.someProperty2}"/>
+ </a4j:jsFunction>
+ ...
+ </h:form>
+ ...
+ </body>]]></programlisting>
+
<para>
- Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find <link linkend="process">" Decide what to process " </link> guide section.
+ The <emphasis role="bold"><property><a4j:jsFunction></property></emphasis> allows to use <emphasis role="bold"><property><a4j:actionparam></property></emphasis> or pure <emphasis role="bold"><property><f:param></property></emphasis> for passing any number of parameters of the JavaScript function into Ajax request.
+ <emphasis role="bold"><property><a4j:jsFunction></property></emphasis> is similar to <emphasis role="bold"><property><a4j:commandButton></property></emphasis>, but it could be activated from the JavaScript code.
+ It allows to invoke some server-side functionality and use the returned data in the JavaScript function invoked from <emphasis><property>"oncomplete"</property></emphasis> attribute.
+ Hence it's possible to use <emphasis role="bold"><property><a4j:jsFunction></property></emphasis> instead of <emphasis role="bold"><property><a4j:commandButton></property></emphasis>.
+ You can put it anywhere, just don't forget to use <emphasis role="bold"><property><h:form></property></emphasis> and <emphasis role="bold"><property></h:form></property></emphasis> around it.
</para>
+ <para>
+ Information about the <emphasis><property>"process"</property></emphasis> attribute usage you can find "<link linkend="process">Decide what to process</link>" guide section.
+ </para>
</section>
<section>
<title>Relevant resources links</title>
<para>
- <ulink
- url="http://www.jboss.org/community/docs/DOC-11856">
- Here
- </ulink>
- you can find additional information and example on how to use
- <emphasis role="bold">
- <property><a4j:jsFunction></property>
- </emphasis>
- with JSON.
+ Vizit the <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/jsFunction.jsf?c=jsFu...">jsFunction page</ulink> at RichFaces LiveDemo for component usage and sources for the given examples.
</para>
- <para> <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/jsFunction.jsf?c=jsFu...">On the component Live Demo page</ulink>
- you can see the example of <emphasis role="bold"
- ><property><a4j:jsFunction></property></emphasis> usage and sources for the given example.</para>
- <para>
- <ulink url="http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/tlddocs/f/param.html">On RichFaces LiveDemo page </ulink> you can found some additional information about <emphasis role="bold"><property><f:param></property></emphasis> component.
- </para>
+
+ <para>
+ Useful articles:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ "<ulink url="http://www.jboss.org/community/docs/DOC-11856">JsFunctionJson</ulink>" article in the RichFaces Cookbook describes how to use <emphasis role="bold"><property>"a4j:jsFunction"</property></emphasis> to call the jsonTest backing bean that generates some random data in a JSON String;
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
</section>
</chapter>
14 years, 10 months
- 1
- 0