JBoss Rich Faces SVN: r7328 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-03-27 15:01:58 -0400 (Thu, 27 Mar 2008)
New Revision: 7328
Modified:
trunk/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml
Log:
http://jira.jboss.com/jira/browse/RF-1207 - key feature added
Modified: trunk/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml 2008-03-27 18:47:46 UTC (rev 7327)
+++ trunk/docs/userguide/en/src/main/docbook/included/fileUpload.desc.xml 2008-03-27 19:01:58 UTC (rev 7328)
@@ -26,15 +26,15 @@
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem>Highly customizable look and feel</listitem>
- <listitem>File types/File sizes restrictions</listitem>
- <listitem>Multiple files upload support </listitem>
- <listitem>Cancel the request possibility </listitem>
- <listitem>One request for every upload component</listitem>
- <listitem>Different submit modes (Server/Client)</listitem>
- <listitem>Asynchronous mode</listitem>
-
- </itemizedlist>
+ <listitem><para>Highly customizable look and feel</para></listitem>
+ <listitem><para>File types and file sizes restrictions</para></listitem>
+ <listitem><para>Multiple files upload support</para></listitem>
+ <listitem><para>Possibility to cancel the request</para></listitem>
+ <listitem><para>One request for every upload component</para></listitem>
+ <listitem><para>Different submit modes (Server/Client)</para></listitem>
+ <listitem><para>Asynchronous mode</para></listitem>
+ <listitem><para>Disablement support</para></listitem>
+ </itemizedlist>
</section>
</section>
\ No newline at end of file
16 years, 9 months
JBoss Rich Faces SVN: r7327 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: dataFilterSlider and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-03-27 14:47:46 -0400 (Thu, 27 Mar 2008)
New Revision: 7327
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/externalFilteringUsage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/externalSortingUsage.xhtml
Log:
Demo site: Data Iteration demos layout correction completed
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns/usage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/columns/usage.xhtml 2008-03-27 18:47:46 UTC (rev 7327)
@@ -22,12 +22,16 @@
and a list of models with prices is generated for each type of car. In the dataTable
cars are grouped by type in a separate columns.
</p>
- <div class="sample-container" >
- <ui:include src="/richfaces/columns/examples/example.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/columns/examples/example.xhtml"/>
- </ui:include>
- </div>
+
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">DataTable Columns example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/columns/examples/example.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/columns/examples/example.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
<h:form>
<p>
Additionally as you see
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataFilterSlider/usage.xhtml 2008-03-27 18:47:46 UTC (rev 7327)
@@ -14,13 +14,15 @@
has 2 modes, the first mode stores the UIData object on session, so as user interaction will work smoothly. The second just sends the
previous and new values as a "sliderEvent" to the backing bean.</p>
- <div class="sample-container">
- <ui:include src="/richfaces/dataFilterSlider/examples/filterData.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/dataFilterSlider/examples/filterData.xhtml"/>
- </ui:include>
-
- </div>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">DataFilterSlider example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/dataFilterSlider/examples/filterData.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/dataFilterSlider/examples/filterData.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/usage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataGrid/usage.xhtml 2008-03-27 18:47:46 UTC (rev 7327)
@@ -16,16 +16,16 @@
The following example shows the dataGrid component in use:
</p>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">DataGrid example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/dataGrid/examples/form.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/dataGrid/examples/form.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
+ </ui:define>
- <div class="sample-container" >
-
- <ui:include src="/richfaces/dataGrid/examples/form.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/dataGrid/examples/form.xhtml"/>
- </ui:include>
-
- </div>
- </ui:define>
-
</ui:composition>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTableScroller/usage.xhtml 2008-03-27 18:47:46 UTC (rev 7327)
@@ -11,14 +11,16 @@
<p>The component is designed to provide the functionality of table
pagination using AJAX requests.</p>
-
- <div class="sample-container">
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Table pagination using DataTableScroller example</legend>
+ <div class="sample-container">
<ui:include src="/richfaces/dataTableScroller/examples/simpleScroller.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/dataTableScroller/examples/simpleScroller.xhtml"/>
<ui:param name="openlabel" value="View Page Source" />
</ui:include>
- </div>
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/externalFilteringUsage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/externalFilteringUsage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/externalFilteringUsage.xhtml 2008-03-27 18:47:46 UTC (rev 7327)
@@ -28,20 +28,21 @@
In next simple example we use <b>filterMethod</b> and <b>filterExpression</b> for the first
and second columns filtering correspondingly.
</p>
- <div class="sample-container" >
-
- <ui:include src="/richfaces/filteringFeature/examples/externalFiltering.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="openlabel" value="View Page Source" />
- <ui:param name="sourcepath" value="/richfaces/filteringFeature/examples/externalFiltering.xhtml"/>
- </ui:include>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/filteringFeature/examples/FilteringBean.java"/>
- <ui:param name="openlabel" value="View FilteringBean.java Source" />
- <ui:param name="sourcetype" value="java" />
- </ui:include>
- </div>
-
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Filtering DataTable example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/filteringFeature/examples/externalFiltering.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="openlabel" value="View Page Source" />
+ <ui:param name="sourcepath" value="/richfaces/filteringFeature/examples/externalFiltering.xhtml"/>
+ </ui:include>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/filteringFeature/examples/FilteringBean.java"/>
+ <ui:param name="openlabel" value="View FilteringBean.java Source" />
+ <ui:param name="sourcetype" value="java" />
+ </ui:include>
+ </div>
+ </fieldset>
<p>
DESCRIPTION
</p>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/externalSortingUsage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/externalSortingUsage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/externalSortingUsage.xhtml 2008-03-27 18:47:46 UTC (rev 7327)
@@ -30,13 +30,15 @@
attributes and it automatically resort its content. In order to perform sorting
just choose the sorting properties, sorting direction and press sort button:
</p>
- <div class="sample-container" >
-
- <ui:include src="/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml"/>
- </ui:include>
- </div>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Sorting DataTable example</legend>
+ <div class="sample-container">
+ <ui:include src="/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
16 years, 9 months
JBoss Rich Faces SVN: r7326 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: filteringFeature and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-03-27 14:21:38 -0400 (Thu, 27 Mar 2008)
New Revision: 7326
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/filteringUsage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml
Log:
Demo site: Data Iteration demos layout correction
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml 2008-03-27 18:12:26 UTC (rev 7325)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/usage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
@@ -10,7 +10,7 @@
- <p>DataTable allows to show a tabular data. Additional to the stadard <h:dataTable>, this component
+ <p>DataTable allows to show a tabular data. Additional to the standard <h:dataTable>, this component
enables row and column spans for columns, a flexible layout for a header and a footer.
DataTable supports "master-detail" pattern and allows to show the combination
of a master table and detail sub-tables.<br />
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/filteringUsage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/filteringUsage.xhtml 2008-03-27 18:12:26 UTC (rev 7325)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature/filteringUsage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
@@ -23,41 +23,45 @@
In this example you could see that two first columns filtered after corresponding
input changed.
</p>
+
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Filtering DataTable example</legend>
+ <div class="sample-container">
<h:panelGrid columns="2" columnClasses="top">
- <div class="sample-container" jsfc="h:panelGroup">
-
- <ui:include src="/richfaces/filteringFeature/examples/simpleFiltering.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/filteringFeature/examples/simpleFiltering.xhtml"/>
- </ui:include>
- </div>
- <h:panelGroup>
- <fieldset>
- <legend><b>Details of usage</b></legend>
- <p>
- In order to change filter event you should change <b>filterEvent</b> attribute
- on column (<i>e.g. filterEvent = "onblur"</i>)
- </p>
- <p>
- In order to get or change current filtering value <b>filterValue </b>attribute
- provided. It should be defined with initial filtering value on the page
- or as value binding to get/change it on server.
- </p>
- <p>
- This is built-in feature. It uses "<b>startsWith</b>" function to make filtering.
- </p>
- <p>
- If <b>filterBy </b>attribute set - column will render default inputs with
- default filtering behaviour
- </p>
- <p>
- In order to change default filtering behaviour - another definition used.
- An example shown at second tab("External Filtering")
- </p>
- </fieldset>
- </h:panelGroup>
+ <h:panelGroup>
+ <ui:include src="/richfaces/filteringFeature/examples/simpleFiltering.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/filteringFeature/examples/simpleFiltering.xhtml"/>
+ </ui:include>
+ </h:panelGroup>
+ <h:panelGroup>
+ <p style="text-align: center">Details of usage</p>
+ <fieldset class="demo_fieldset">
+ <p>
+ In order to change filter event you should change <b>filterEvent</b> attribute
+ on column (<i>e.g. filterEvent = "onblur"</i>)
+ </p>
+ <p>
+ In order to get or change current filtering value <b>filterValue </b>attribute
+ provided. It should be defined with initial filtering value on the page
+ or as value binding to get/change it on server.
+ </p>
+ <p>
+ This is built-in feature. It uses "<b>startsWith</b>" function to make filtering.
+ </p>
+ <p>
+ If <b>filterBy </b>attribute set - column will render default inputs with
+ default filtering behaviour
+ </p>
+ <p>
+ In order to change default filtering behaviour - another definition used.
+ An example shown at second tab("External Filtering")
+ </p>
+ </fieldset>
+ </h:panelGroup>
</h:panelGrid>
-
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml 2008-03-27 18:12:26 UTC (rev 7325)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
@@ -19,21 +19,21 @@
Here you could explore how to make updatable only two particular
cells of a table using Ajax Keys.
</p>
-
- <div class="sample-container" >
-
- <ui:include src="/richfaces/repeat/examples/repeater.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/repeat/examples/repeater.xhtml"/>
- </ui:include>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/repeat/examples/UpdateBean.java"/>
- <ui:param name="openlabel" value="View UpdateBean.java Source" />
- <ui:param name="sourcetype" value="java" />
- </ui:include>
-
- </div>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Repeat example</legend>
+ <div class="sample-container" >
+ <ui:include src="/richfaces/repeat/examples/repeater.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/repeat/examples/repeater.xhtml"/>
+ </ui:include>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/repeat/examples/UpdateBean.java"/>
+ <ui:param name="openlabel" value="View UpdateBean.java Source" />
+ <ui:param name="sourcetype" value="java" />
+ </ui:include>
+ </div>
+ </fieldset>
</ui:define>
</ui:composition>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/usage.xhtml 2008-03-27 18:12:26 UTC (rev 7325)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/usage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
@@ -17,23 +17,22 @@
<li>sorting of columns by clicking the header;</li>
<li>fixing of one or more left columns when a table is scrolled horizontally;</li>
<li>one and multi-selection rows mode;</li>
- <li>customization of table look-n-fill from skin parameters</li>
- <li>customizing the table look-n-fill from skin parameters</li>
+ <li>customization of table look-n-feel from skin parameters</li>
+ <li>customizing the table look-n-feel from skin parameters</li>
</ul>
</p>
- <div class="sample-container">
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Scrollable DataTable example</legend>
+ <div class="sample-container">
<ui:include src="/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml"/>
<ui:param name="openlabel" value="View Page Source" />
</ui:include>
- </div>
+ </div>
+ </fieldset>
- <p>
-
- </p>
-
</ui:define>
</ui:composition>
</html>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml 2008-03-27 18:12:26 UTC (rev 7325)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml 2008-03-27 18:21:38 UTC (rev 7326)
@@ -25,46 +25,48 @@
In this example you could see that two first columns sorted after corresponding
header click.
</p>
- <div class="sample-container" jsfc="h:panelGroup" layout="block">
- <h:panelGrid columns="2" columnClasses=",top">
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Sorting DataTable example</legend>
+ <div class="sample-container">
+ <h:panelGrid columns="2" columnClasses="top">
<h:panelGroup>
<ui:include src="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
+ </ui:include>
</h:panelGroup>
- <div jsfc="h:panelGroup" layout="block">
- <fieldset>
- <legend><b>Details Of usage</b></legend>
- <p>
- Next attributes could be defined to manage simple built-in sorting:
- </p>
- <ul>
- <li>
- <b>sortMode</b> - attribute of <b>rich:dataTable</b> which could be defined as
- "single"(Default) and "multiple". If multiple sorting defined -
- previous sorting will not be reseted. Column will be sorted
- </li>
- <li><b>sortOrder</b> - attribute of <b>rich:column</b>
- allows to set initial sorting on the column.
- (Additional ways of usage to customize sorting described at "External
- Sorting" tab). Possible values are "ASCENDING", "DESCENDING" and
- "UNSORTED"(default)
- </li>
- <li>
- <b>selfSorted</b> attribute of <b>brich:column</b> which defines
- if the table will make header clickable and if click on the
- header will call sorting request.
- Default value is "true". In order to use custom sorting mechanism
- use value "false" for this attribute.
- </li>
- </ul>
+
+ <h:panelGroup>
+ <p style="text-align: center">Details of usage</p>
+ <fieldset class="demo_fieldset">
+ <p>
+ Next attributes could be defined to manage simple built-in sorting:
+ </p>
+ <ul>
+ <li>
+ <b>sortMode</b> - attribute of <b>rich:dataTable</b> which could be defined as
+ "single"(Default) and "multiple". If multiple sorting defined -
+ previous sorting will not be reseted. Column will be sorted
+ </li>
+ <li><b>sortOrder</b> - attribute of <b>rich:column</b>
+ allows to set initial sorting on the column.
+ (Additional ways of usage to customize sorting described at "External
+ Sorting" tab). Possible values are "ASCENDING", "DESCENDING" and
+ "UNSORTED"(default)
+ </li>
+ <li>
+ <b>selfSorted</b> attribute of <b>brich:column</b> which defines
+ if the table will make header clickable and if click on the
+ header will call sorting request.
+ Default value is "true". In order to use custom sorting mechanism
+ use value "false" for this attribute.
+ </li>
+ </ul>
</fieldset>
- </div>
+ </h:panelGroup>
</h:panelGrid>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
- </ui:include>
</div>
-
+ </fieldset>
</ui:define>
-
</ui:composition>
</html>
16 years, 9 months
JBoss Rich Faces SVN: r7325 - in trunk: ui/assembly and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-03-27 14:12:26 -0400 (Thu, 27 Mar 2008)
New Revision: 7325
Modified:
trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.2.js
trunk/ui/assembly/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-1914
Modified: trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.2.js
===================================================================
--- trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.2.js 2008-03-27 18:02:31 UTC (rev 7324)
+++ trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.2.js 2008-03-27 18:12:26 UTC (rev 7325)
@@ -73,10 +73,6 @@
Class.Methods = {
addMethods: function(source) {
- if (!source) {
- return;
- }
-
var ancestor = this.superclass && this.superclass.prototype;
var properties = Object.keys(source);
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2008-03-27 18:02:31 UTC (rev 7324)
+++ trunk/ui/assembly/pom.xml 2008-03-27 18:12:26 UTC (rev 7325)
@@ -300,6 +300,21 @@
<include>
${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/PickList-min.js
</include>
+ <include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/comboboxUtils-min.js
+ </include>
+ <include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/combolist-min.js
+ </include>
+ <include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/inplaceinput-min.js
+ </include>
+ <include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/inplaceselectlist-min.js
+ </include>
+ <include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/inplaceselect-min.js
+ </include>
<include>**/*-min.js</include>
</includes>
<!-- files to exclude, path relative to output's directory -->
16 years, 9 months
JBoss Rich Faces SVN: r7324 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2008-03-27 14:02:31 -0400 (Thu, 27 Mar 2008)
New Revision: 7324
Modified:
trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.xml
Log:
http://jira.jboss.com/jira/browse/RF-1226
Some descriptiones were changed.
Modified: trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.desc.xml 2008-03-27 17:59:06 UTC (rev 7323)
+++ trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.desc.xml 2008-03-27 18:02:31 UTC (rev 7324)
@@ -24,7 +24,7 @@
<title>Key Features</title>
<itemizedlist>
<listitem>Option to display "save", "cancel" buttons</listitem>
- <listitem>Possibility to assign an JS action on state change</listitem>
+ <listitem>Possibility to assign an JavaScript action on state change</listitem>
<listitem>Switching between<emphasis role="bold"><property><rich:inplaceInput></property></emphasis> components using "Tab" key</listitem>
<listitem>Resizable input field</listitem>
</itemizedlist>
Modified: trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.xml 2008-03-27 17:59:06 UTC (rev 7323)
+++ trunk/docs/userguide/en/src/main/docbook/included/inplaceInput.xml 2008-03-27 18:02:31 UTC (rev 7324)
@@ -72,16 +72,16 @@
<para>
As it was mentioned earlier the
<emphasis role="bold"><property><rich:inplaceInput></property> </emphasis>
- component was designed to facilitate inputting and editing some parts of a text.
+ component was designed to facilitate inputting and editing some parts of text.
</para>
<para>
The component has three logical states:
<itemizedlist>
<listitem>
- <para><property>"View"</property> state displays the text containing in a <emphasis><property>"value"</property></emphasis> attribute;</para>
+ <para><property>View</property> state displays the text containing in a <emphasis><property>"value"</property></emphasis> attribute;</para>
<figure>
- <title>"View" state</title>
+ <title>View state</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/inplaceInputViewState_shadow.png"/>
@@ -90,9 +90,9 @@
</figure>
</listitem>
<listitem>
- <para><property>"Editable"</property>state - the text can be edited and saved;</para>
+ <para><property>;Edit</property>state - the text can be edited and saved;</para>
<figure>
- <title>"Editable" state</title>
+ <title>Edit state</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/inplaceInputEditState_shadow.png"/>
@@ -101,9 +101,9 @@
</figure>
</listitem>
<listitem>
- <para><property>"Changed"</property>state - displays the edited text and indicates that it was edited, changed</para>
+ <para><property>Changed</property>state - displays the edited text and indicates that it was edited, changed</para>
<figure>
- <title>"Changed" state</title>
+ <title>Changed state</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/inplaceInputChangedState_shadow.png"/>
@@ -130,8 +130,8 @@
However, if
<emphasis><property>"value"</property></emphasis>
attribute is not defined, you can use
- <emphasis><property>"defaultLabel attribute "</property></emphasis>
- which will display some default text while
+ <emphasis><property>"defaultLabel"</property></emphasis> attribute
+ which displays some default text while
<emphasis><property>"value"</property></emphasis>
attribute stays undefined.
</para>
@@ -153,10 +153,10 @@
<para>
- Input data is saved (submitted) automatically when the input field loses focus.
- Nevertheless, you can use a
+ Input data is saved (submitted) automatically whenever the input field loses focus.
+ Nevertheless, you can use the
<emphasis><property>"showControls"</property></emphasis>
- attribute, which make <property>"save"</property>and <property>"cancel" </property> buttons
+ attribute, which makes <property>"save"</property>and <property>"cancel" </property> buttons
appear next to the input field.
</para>
<para>
@@ -205,7 +205,7 @@
<emphasis><property>"saveControlIcon"</property></emphasis>
and
<emphasis><property>"cancelControlIcon"</property></emphasis>
- attributes relatively. You need to define the path to where your images are located.
+ attributes r. You need to define the path to where your images are located.
</para>
<para>
<emphasis role="bold">Example:</emphasis>
@@ -227,19 +227,34 @@
</imageobject>
</mediaobject>
</figure>
+ <para>
+ The
+ <emphasis><property>"inputWidth"</property></emphasis>,
+ <emphasis><property>"minInputWidth"</property></emphasis>, and
+ <emphasis><property>"maxInputWidth"</property></emphasis>
+ attributes are provided to specify the width, minimal width and maximal width for the input element respectively.
+
+ </para>
+
+
<para>
The
<emphasis><property>"editEvent"</property></emphasis>
- attribute provides an option to assign an JS action that triggers state changing from
- <property>"View"</property>
+ attribute provides an option to assign an JavaScript action that initiates the change of the state from
+ <property>view</property>
to
- <property>"Edit"</property>.
+ <property>edit</property>.
+
+
The default value is "click".
- </para>
+ </para>
+
+
+
<note>
<para>
@@ -248,6 +263,17 @@
</para>
</note>
+
+ <para>
+ Having multiple
+ <emphasis role="bold"><property><rich:inplaceInput></property></emphasis>
+ components
+ on a page you can use <emphasis><property>"tabindex"</property></emphasis> attribute that enables switching (tabbing)
+ between the components by pressing the “Tab” key.
+ Switching order is determined by the value of the attribute which is an integer between 0 and 32767.
+ </para>
+
+
<para>
The
@@ -255,7 +281,7 @@
<emphasis><property>"selectOnEdit"</property></emphasis>
(with possible values "true", "false") gives you an
option to make the text in the input area selected right after the change from
- <property>"View"</property> state to <property>"Edit"</property>.
+ <property>view</property> state to <property>edit</property> occurs.
</para>
<para>
@@ -266,10 +292,10 @@
and
<emphasis><property>" onviewactivated"</property></emphasis>
provide a possibility to assign JavaScript code on
- <property>"Edit"</property> state activation, on
- <property>"Edit"</property> state activated,on
- <property>"View"</property> state activation and on
- <property>"View"</property> state activated respectively.
+ <property>edit</property> state activation, on
+ <property>edit</property> state activated,on
+<property>view</property> state activation and on
+<property>view</property> state activated respectively.
</para>
@@ -283,8 +309,8 @@
<para>
The given code illustrates how onviewactivation attribute works,
namely when the state is being changed from
- <property>"Edit"</property> to
- <property>"View"</property>,
+ <property>edit</property> to
+ <property>view</property>,
a confirmation window with a message
"Are you sure you want to change value?" comes up.
</para>
@@ -302,12 +328,17 @@
<tbody>
<row>
<entry>ENTER</entry>
- <entry>Saves the input data, and changes the state from "Edit" to "Changed"</entry>
+ <entry>Saves the input data, and changes the state from edit to changed</entry>
</row>
<row>
<entry>ESC</entry>
- <entry>changes the state from "Edit" to "View" or "Changed", value is not affected</entry>
+ <entry>changes the state from edit to view or changed, value is not affected</entry>
</row>
+
+ <row>
+ <entry>TAB</entry>
+ <entry>switches between the components</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -334,7 +365,7 @@
<!--Sorting API -->
<row>
<entry>edit()</entry>
- <entry>changes the state to Edit </entry>
+ <entry>changes the state to edit </entry>
</row>
<row>
@@ -345,15 +376,15 @@
<row>
<entry>save()</entry>
- <entry>the component hanges the state to the previous one before editing (Changed or View)</entry>
+ <entry>the component hanges the state to the previous one before editing (changed or view)</entry>
</row>
<row>
<entry>save()</entry>
- <entry>the component changes its state to Changed with a new value</entry>
+ <entry>the component changes its state to changed with a new value</entry>
</row>
<row>
<entry>save()</entry>
- <entry>the component changes its state to Changed with a new value</entry>
+ <entry>the component changes its state to changed with a new value</entry>
</row>
<row>
<entry>getValue()</entry>
@@ -434,7 +465,7 @@
</table>
<table>
- <title>Skin parameters redefinition for "View" state</title>
+ <title>Skin parameters redefinition for view state</title>
<tgroup cols="2">
<thead>
@@ -491,7 +522,7 @@
</table>
<table>
- <title>Classes names that define input field look and feel in "Edit" state </title>
+ <title>Classes names that define input field look and feel in edit state </title>
<tgroup cols="2">
<thead>
@@ -540,7 +571,7 @@
<table>
- <title>Class name for the "View" state</title>
+ <title>Class name for the view state</title>
<tgroup cols="2">
<thead>
<row>
@@ -551,12 +582,12 @@
<tbody>
<row>
<entry>rich-inplace-view</entry>
- <entry>Defines styles for the "View" state</entry>
+ <entry>Defines styles for the view state</entry>
</row>
<row>
<entry>rich-inplace-input-view-hover</entry>
- <entry>Defines styles for hovered text in the "View" state </entry>
+ <entry>Defines styles for hovered text in the view state </entry>
</row>
</tbody>
@@ -569,7 +600,7 @@
<table>
- <title>Class name for the input field in "Edit" state</title>
+ <title>Class name for the input field in edit state</title>
<tgroup cols="2">
<thead>
<row>
@@ -580,7 +611,7 @@
<tbody>
<row>
<entry>rich-inplace-field</entry>
- <entry>Defines styles for input field look and feel in "Edit" state</entry>
+ <entry>Defines styles for input field look and feel in edit state</entry>
</row>
</tbody>
@@ -687,7 +718,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>In the shown example the font in "Edit" state is changed to bold.</para>
+ <para>In the shown example the font in <property>edit</property> state is changed to bold.</para>
16 years, 9 months
JBoss Rich Faces SVN: r7323 - trunk/samples/richfaces-demo/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-27 13:59:06 -0400 (Thu, 27 Mar 2008)
New Revision: 7323
Modified:
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
Log:
accidentally commited
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-03-27 17:56:40 UTC (rev 7322)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-03-27 17:59:06 UTC (rev 7323)
@@ -45,7 +45,7 @@
</context-param>
<context-param>
<param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
- <param-value>NONE</param-value>
+ <param-value>NONE, NEKO, TIDY</param-value>
</context-param>
<context-param>
<param-name>org.richfaces.CONTROL_SKINNING</param-name>
16 years, 9 months
JBoss Rich Faces SVN: r7322 - trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-27 13:56:40 -0400 (Thu, 27 Mar 2008)
New Revision: 7322
Added:
trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/RowKeyConverterRule.java
Log:
http://jira.jboss.com/jira/browse/RF-2669
Added: trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/RowKeyConverterRule.java
===================================================================
--- trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/RowKeyConverterRule.java (rev 0)
+++ trunk/ui/core/src/main/java/org/ajax4jsf/taglib/html/facelets/RowKeyConverterRule.java 2008-03-27 17:56:40 UTC (rev 7322)
@@ -0,0 +1,85 @@
+/**
+ *
+ */
+package org.ajax4jsf.taglib.html.facelets;
+
+import javax.faces.convert.Converter;
+
+import org.ajax4jsf.component.UIDataAdaptor;
+
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.tag.MetaRule;
+import com.sun.facelets.tag.Metadata;
+import com.sun.facelets.tag.MetadataTarget;
+import com.sun.facelets.tag.TagAttribute;
+
+/**
+ * Apply rowKeyConverter to component
+ * @author Maksim Kaszynski
+ *
+ */
+public class RowKeyConverterRule extends MetaRule {
+
+ static final class DynamicConverterMetaData extends Metadata {
+
+ private final TagAttribute attribute;
+
+ public DynamicConverterMetaData(TagAttribute attribute) {
+ super();
+ this.attribute = attribute;
+ }
+
+ @Override
+ public void applyMetadata(FaceletContext ctx, Object instance) {
+ ((UIDataAdaptor) instance).setValueExpression("rowKeyConverter",
+ attribute.getValueExpression(ctx, Converter.class));
+
+ }
+ }
+
+ static final class StaticConverterMetadata extends Metadata {
+
+ private final String converterId;
+
+ public StaticConverterMetadata(String converterId) {
+ super();
+ this.converterId = converterId;
+ }
+
+ @Override
+ public void applyMetadata(FaceletContext ctx, Object instance) {
+ Converter converter = ctx.getFacesContext().getApplication()
+ .createConverter(converterId);
+ ((UIDataAdaptor) instance).setRowKeyConverter(converter);
+
+ }
+ }
+
+ public static final RowKeyConverterRule INSTANCE = new RowKeyConverterRule();
+
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String,
+ * com.sun.facelets.tag.TagAttribute,
+ * com.sun.facelets.tag.MetadataTarget)
+ */
+ @Override
+ public Metadata applyRule(String name, TagAttribute attribute,
+ MetadataTarget meta) {
+
+ if (meta.isTargetInstanceOf(UIDataAdaptor.class)) {
+ if ("rowKeyConverter".equals(name)) {
+ if (attribute.isLiteral()) {
+ return new StaticConverterMetadata(attribute.getValue());
+ } else {
+ return new DynamicConverterMetaData(attribute);
+ }
+ }
+ }
+
+ return null;
+ }
+
+}
16 years, 9 months
JBoss Rich Faces SVN: r7321 - trunk/samples/richfaces-demo/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-27 13:56:36 -0400 (Thu, 27 Mar 2008)
New Revision: 7321
Modified:
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
Log:
http://jira.jboss.com/jira/browse/RF-2669
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-03-27 17:56:33 UTC (rev 7320)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-03-27 17:56:36 UTC (rev 7321)
@@ -45,7 +45,7 @@
</context-param>
<context-param>
<param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
- <param-value>NONE, NEKO, TIDY</param-value>
+ <param-value>NONE</param-value>
</context-param>
<context-param>
<param-name>org.richfaces.CONTROL_SKINNING</param-name>
16 years, 9 months
JBoss Rich Faces SVN: r7320 - in trunk/ui/scrollableDataTable: src/main/config/component and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-27 13:56:33 -0400 (Thu, 27 Mar 2008)
New Revision: 7320
Added:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/taglib/
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/taglib/ScrollableDataTableTagHandler.java
Modified:
trunk/ui/scrollableDataTable/pom.xml
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/ScrollableDataTableRowKeyConverter.java
Log:
http://jira.jboss.com/jira/browse/RF-2669
Modified: trunk/ui/scrollableDataTable/pom.xml
===================================================================
--- trunk/ui/scrollableDataTable/pom.xml 2008-03-27 17:51:02 UTC (rev 7319)
+++ trunk/ui/scrollableDataTable/pom.xml 2008-03-27 17:56:33 UTC (rev 7320)
@@ -77,5 +77,10 @@
<artifactId>dataTable</artifactId>
<version>3.2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2008-03-27 17:51:02 UTC (rev 7319)
+++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2008-03-27 17:56:33 UTC (rev 7320)
@@ -39,6 +39,10 @@
<superclassname>org.ajax4jsf.tests.AbstractJspTestCase</superclassname>
</test>
</tag>
+
+ <taghandler generate="false">
+ <classname>org.richfaces.taglib.ScrollableDataTableTagHandler</classname>
+ </taghandler>
<property>
<name>frozenColCount</name>
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2008-03-27 17:51:02 UTC (rev 7319)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2008-03-27 17:56:33 UTC (rev 7320)
@@ -28,6 +28,7 @@
import org.apache.commons.collections.iterators.IteratorChain;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.richfaces.convert.rowkey.ScrollableDataTableRowKeyConverter;
import org.richfaces.event.AttributeHolder;
import org.richfaces.event.ScrollableGridViewEvent;
import org.richfaces.event.sort.MultiColumnSortListener;
@@ -75,6 +76,9 @@
private SortListener sortListener;
+ private Converter defaultRowKeyConverter = new ScrollableDataTableRowKeyConverter();
+
+
public abstract SortOrder getSortOrder();
public abstract void setSortOrder(SortOrder sortOrder) ;
@@ -434,4 +438,17 @@
}
+ @Override
+ public Converter getRowKeyConverter() {
+ Converter converter = super.getRowKeyConverter();
+ if (null == converter) {
+ return defaultRowKeyConverter;
+ }
+ return converter;
+ }
+
+ @Override
+ public void setRowKeyConverter(Converter rowKeyConverter) {
+ super.setRowKeyConverter(rowKeyConverter);
+ }
}
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/ScrollableDataTableRowKeyConverter.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/ScrollableDataTableRowKeyConverter.java 2008-03-27 17:51:02 UTC (rev 7319)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/rowkey/ScrollableDataTableRowKeyConverter.java 2008-03-27 17:56:33 UTC (rev 7320)
@@ -17,6 +17,9 @@
*/
public class ScrollableDataTableRowKeyConverter implements Converter {
+
+ public static final String CONVERTER_ID = "org.richfaces.convert.rowkey.ScrollableDataTableRowKeyConverter";
+
/* (non-Javadoc)
* @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String)
*/
Added: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/taglib/ScrollableDataTableTagHandler.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/taglib/ScrollableDataTableTagHandler.java (rev 0)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/taglib/ScrollableDataTableTagHandler.java 2008-03-27 17:56:33 UTC (rev 7320)
@@ -0,0 +1,33 @@
+/**
+ *
+ */
+package org.richfaces.taglib;
+
+import org.ajax4jsf.taglib.html.facelets.RowKeyConverterRule;
+
+import com.sun.facelets.tag.MetaRuleset;
+import com.sun.facelets.tag.jsf.ComponentConfig;
+import com.sun.facelets.tag.jsf.ComponentHandler;
+
+/**
+ * @author Maksim Kaszynski
+ *
+ */
+public class ScrollableDataTableTagHandler extends ComponentHandler {
+
+ public ScrollableDataTableTagHandler(ComponentConfig config) {
+ super(config);
+ }
+
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected MetaRuleset createMetaRuleset(Class type) {
+
+ MetaRuleset ruleset = super.createMetaRuleset(type);
+
+ ruleset.addRule(RowKeyConverterRule.INSTANCE);
+
+ return ruleset;
+ }
+}
16 years, 9 months
JBoss Rich Faces SVN: r7319 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-03-27 13:51:02 -0400 (Thu, 27 Mar 2008)
New Revision: 7319
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
fix bugs
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-27 17:30:03 UTC (rev 7318)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-03-27 17:51:02 UTC (rev 7319)
@@ -124,7 +124,7 @@
this.fileInput = fileInput;
this.uploadObject = uploadObject;
- var content = FileUploadEntry.template.invoke('getContent', {fileName: $F(this.fileInput), fileEntryWidth: uploadObject.fileEntryWidth, className : this.uploadObject.classes.FILE_ENTRY.ENABLED }).join('');
+ var content = FileUploadEntry.template.invoke('getContent', {fileName: $F(this.fileInput), fileEntryWidth: uploadObject.getFileEntryWidth(), className : this.uploadObject.classes.FILE_ENTRY.ENABLED }).join('');
Element.insert(this.uploadObject.items, content);
@@ -412,7 +412,7 @@
this.initEvents();
this.setupAutoUpload();
this.checkFrame();
- this.initFileEntryWidth();
+ //this.initFileEntryWidth();
this.initLabels(labels);
this.processButtons();
this.initFileInput();
@@ -442,8 +442,11 @@
}
},
- initFileEntryWidth: function () {
- var w;
+ getFileEntryWidth: function () {
+ if (this.fileEntryWidth) {
+ return this.fileEntryWidth;
+ }
+ var w;
if (this.element.getWidth() != 0) {
w = this.element.getWidth() - 122;
} else {
@@ -460,6 +463,7 @@
$(this._progressBar.id + ":complete").style.width = w;
}
}
+ return this.fileEntryWidth;
},
createFrame: function () {
16 years, 9 months