JBoss Rich Faces SVN: r6137 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-02-18 09:09:11 -0500 (Mon, 18 Feb 2008)
New Revision: 6137
Modified:
trunk/docs/userguide/en/src/main/docbook/included/pickList.xml
Log:
http://jira.jboss.com/jira/browse/RF-2174 - Error in XML syntax fixed
Modified: trunk/docs/userguide/en/src/main/docbook/included/pickList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-02-18 14:08:44 UTC (rev 6136)
+++ trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-02-18 14:09:11 UTC (rev 6137)
@@ -253,11 +253,11 @@
<!--Controls common API -->
<row>
- <entry>Hide()</entry>
+ <entry>hide()</entry>
<entry>Hides ordering control</entry>
</row>
<row>
- <entry>Show()</entry>
+ <entry>show()</entry>
<entry>Shows ordering control</entry>
</row>
<row>
@@ -265,11 +265,11 @@
<entry>Checks if current control is shown</entry>
</row>
<row>
- <entry>Enable()</entry>
+ <entry>enable()</entry>
<entry>Enables ordering control</entry>
</row>
<row>
- <entry>Disable()</entry>
+ <entry>disable()</entry>
<entry>Disables ordering control</entry>
</row>
<row>
@@ -311,7 +311,7 @@
<section>
<title>Skin Parameters Redefinition</title>
- <table>
+ <!--table>
<title>Skin parameters redefinition for a wrapper <div> element of a list</title>
<tgroup cols="2">
<thead>
@@ -321,10 +321,12 @@
</row>
</thead>
<tbody>
-
+ <row>
+ <entry></entry>
+ </row>
</tbody>
</tgroup>
- </table>
+ </table-->
18 years, 2 months
JBoss Rich Faces SVN: r6136 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-02-18 09:08:44 -0500 (Mon, 18 Feb 2008)
New Revision: 6136
Modified:
trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml
trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml
Log:
http://jira.jboss.com/jira/browse/RF-2261 - done
Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-02-18 13:00:12 UTC (rev 6135)
+++ trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-02-18 14:08:44 UTC (rev 6136)
@@ -218,16 +218,19 @@
<para>
The <emphasis role="bold"><property><rich:listShuttle></property></emphasis> component allows to use internationalization method
to redefine and localize the labels. You could use application resource bundle and define
- <property>RICH_SHUTTLES_TOP_LABEL </property>,
+ <property>RICH_SHUTTLES_TOP_LABEL</property>,
<property>RICH_SHUTTLES_BOTTOM_LABEL</property>,
- <property>RICH_SHUTTLES_UP_LABEL </property>,
- <property>RICH_SHUTTLES_DOWN_LABEL </property>
+ <property>RICH_SHUTTLES_UP_LABEL</property>,
+ <property>RICH_SHUTTLES_DOWN_LABEL</property>
<property>RICH_LIST_SHUTTLE_COPY_ALL_LABEL</property>,
<property>RICH_LIST_SHUTTLE_COPY_LABEL</property>,
<property>RICH_LIST_SHUTTLE_REMOVE_ALL_LABEL</property>,
- <property>RICH_LIST_SHUTTLE_REMOVE_LABEL </property> there.
+ <property>RICH_LIST_SHUTTLE_REMOVE_LABEL</property> there.
</para>
+ <para>
+ You could also pack <property>org.richfaces.renderkit.listShuttle</property> resource bundle with your JARs defining the same properties.
+ </para>
<!-- template wiil be done in 3.2.0 -->
<!--para>The <emphasis role="bold">
<property><rich:listShuttle></property>
@@ -359,11 +362,11 @@
-->
<!--Controls common API -->
<row>
- <entry>Hide()</entry>
+ <entry>hide()</entry>
<entry>Hides ordering control</entry>
</row>
<row>
- <entry>Show()</entry>
+ <entry>show()</entry>
<entry>Shows ordering control</entry>
</row>
<row>
@@ -371,11 +374,11 @@
<entry>Checks if current control is shown</entry>
</row>
<row>
- <entry>Enable()</entry>
+ <entry>enable()</entry>
<entry>Enables ordering control</entry>
</row>
<row>
- <entry>Disable()</entry>
+ <entry>disable()</entry>
<entry>Disables ordering control</entry>
</row>
<row>
Modified: trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml 2008-02-18 13:00:12 UTC (rev 6135)
+++ trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml 2008-02-18 14:08:44 UTC (rev 6136)
@@ -109,8 +109,6 @@
Currently the button controls type is based on <div> element.
</para>
</note>
-
- fastOrderControlsVisible
<para> The <emphasis>
<property>"selection" </property>
</emphasis> attribute stores the collection of items selected by you. In the example
@@ -290,11 +288,14 @@
<para>
The <emphasis role="bold"><property><rich:orderingList></property></emphasis> component allows to use internationalization method
to redefine and localize the labels. You could use application resource bundle and define
- <property>RICH_SHUTTLES_TOP_LABEL </property>,
+ <property>RICH_SHUTTLES_TOP_LABEL</property>,
<property>RICH_SHUTTLES_BOTTOM_LABEL</property>,
- <property>RICH_SHUTTLES_UP_LABEL </property>,
- <property>RICH_SHUTTLES_DOWN_LABEL </property> there.
+ <property>RICH_SHUTTLES_UP_LABEL</property>,
+ <property>RICH_SHUTTLES_DOWN_LABEL</property> there.
</para>
+ <para>
+ You could also pack <property>org.richfaces.renderkit.orderingList</property> resource bundle with your JARs defining the same properties.
+ </para>
<!-- Wiil be done for 3.2.0 version-->
<!--para>The component provides possibility to be customized using templating. The
customization could be performed by a layout definition nested into the component. 5
@@ -413,11 +414,11 @@
<!--Controls common API -->
<row>
- <entry>Hide()</entry>
+ <entry>hide()</entry>
<entry>Hides ordering control</entry>
</row>
<row>
- <entry>Show()</entry>
+ <entry>show()</entry>
<entry>Shows ordering control</entry>
</row>
<row>
@@ -425,11 +426,11 @@
<entry>Checks if current control is shown</entry>
</row>
<row>
- <entry>Enable()</entry>
+ <entry>enable()</entry>
<entry>Enables ordering control</entry>
</row>
<row>
- <entry>Disable()</entry>
+ <entry>disable()</entry>
<entry>Disables ordering control</entry>
</row>
<row>
18 years, 2 months
JBoss Rich Faces SVN: r6135 - in trunk/sandbox/samples/inplaceInput-sample/src/main: webapp/WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-18 08:00:12 -0500 (Mon, 18 Feb 2008)
New Revision: 6135
Modified:
trunk/sandbox/samples/inplaceInput-sample/src/main/java/org/richfaces/samples/Bean.java
trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/WEB-INF/web.xml
trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp
trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml
Log:
Modified: trunk/sandbox/samples/inplaceInput-sample/src/main/java/org/richfaces/samples/Bean.java
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/src/main/java/org/richfaces/samples/Bean.java 2008-02-18 12:58:55 UTC (rev 6134)
+++ trunk/sandbox/samples/inplaceInput-sample/src/main/java/org/richfaces/samples/Bean.java 2008-02-18 13:00:12 UTC (rev 6135)
@@ -10,7 +10,7 @@
private String defaultLabel = "Click...";
- private String controlsPosition="right";
+ private String controlsPosition="center";
private Integer inputMaxLength = 255;
Modified: trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/WEB-INF/web.xml 2008-02-18 12:58:55 UTC (rev 6134)
+++ trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/WEB-INF/web.xml 2008-02-18 13:00:12 UTC (rev 6135)
@@ -2,7 +2,7 @@
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>Archetype Created Web Application</display-name>
-
+<!--
<context-param>
<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
<param-value>com.sun.facelets.FaceletViewHandler</param-value>
@@ -10,7 +10,7 @@
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
- </context-param>
+ </context-param> -->
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
<param-value>/WEB-INF/faces-config.xml</param-value>
Modified: trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp 2008-02-18 12:58:55 UTC (rev 6134)
+++ trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp 2008-02-18 13:00:12 UTC (rev 6135)
@@ -29,6 +29,9 @@
<h:outputText value="defaultLabel is: " />
<h:inputText value="#{bean.defaultLabel}" />
+
+ <h:outputText value="value is: " />
+ <h:inputText value="#{bean.value}" />
<h:outputText value="width (in 'px'): "/>
<h:inputText value="#{bean.width}" />
@@ -68,13 +71,12 @@
<div style="width: 300px">
Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former
<ii:inplaceInput
- id="inplace"
value="#{bean.value}"
selectOnEdit="#{bean.selectOnEdit}"
showControls="#{bean.showControls}"
applyFromControlsOnly="#{bean.applyFromControlsOnly}"
defaultLabel="#{bean.defaultLabel}"
- width="#{bean.width}"
+ inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
controlsPosition="#{bean.controlsPosition}"
Modified: trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml 2008-02-18 12:58:55 UTC (rev 6134)
+++ trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml 2008-02-18 13:00:12 UTC (rev 6135)
@@ -32,6 +32,10 @@
<h:outputText value="defaultLabel is: " />
<h:inputText value="#{bean.defaultLabel}" />
+
+ <h:outputText value="value is: " />
+ <h:inputText value="#{bean.value}" />
+
<h:outputText value="width (in 'px'): "/>
<h:inputText value="#{bean.width}" />
@@ -74,13 +78,12 @@
<div style="width: 300px">
Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former
<ii:inplaceInput
- id="inplace"
value="#{bean.value}"
selectOnEdit="#{bean.selectOnEdit}"
showControls="#{bean.showControls}"
applyFromControlsOnly="#{bean.applyFromControlsOnly}"
defaultLabel="#{bean.defaultLabel}"
- width="#{bean.width}"
+ inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
maxInputWidth="#{bean.maxInputWidth}"
inputMaxLength="#{bean.inputMaxLength}"
18 years, 2 months
JBoss Rich Faces SVN: r6134 - trunk/sandbox/ui/inplaceInput/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-18 07:58:55 -0500 (Mon, 18 Feb 2008)
New Revision: 6134
Modified:
trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
Log:
?\209?\128?\208?\181?\209?\136?\208?\181?\208?\189?\208?\190 ?\208?\180?\208?\181?\208?\187?\208?\176?\209?\130?\209?\140 select ?\208?\189?\208?\176 ?\208?\190?\209?\129?\208?\189?\208?\190?\208?\178?\208?\181 ?\209?\128?\208?\181?\208?\176?\208?\187?\208?\184?\208?\183?\208?\190?\208?\178?\208?\176?\208?\189?\208?\189?\208?\190?\208?\179?\208?\190 combobox
Modified: trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-18 12:58:42 UTC (rev 6133)
+++ trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-18 12:58:55 UTC (rev 6134)
@@ -39,12 +39,12 @@
</property>
<property>
- <name>inputMaxWidth</name>
+ <name>maxInputWidth</name>
<classname>java.lang.String</classname>
<defaultvalue><![CDATA["150px"]]></defaultvalue>
</property>
<property>
- <name>inputMinWidth</name>
+ <name>minInputWidth </name>
<classname>java.lang.String</classname>
<defaultvalue><![CDATA["70px"]]></defaultvalue>
</property>
18 years, 2 months
JBoss Rich Faces SVN: r6133 - trunk/sandbox/ui/inplaceInput/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-18 07:58:42 -0500 (Mon, 18 Feb 2008)
New Revision: 6133
Modified:
trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
Log:
rename input(Max/Min)Width according spec
Modified: trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-18 12:57:59 UTC (rev 6132)
+++ trunk/sandbox/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-02-18 12:58:42 UTC (rev 6133)
@@ -131,8 +131,8 @@
verticalPosition : '#{component.attributes["controlsPosition"]}',
horizontalPosition : '#{component.attributes["controlsHorizontalAlign"]}',
inputWidth : '#{component.attributes["inputWidth"]}',
- inputMinWidth : '#{component.attributes["inputMinWidth"]}',
- inputMaxWidth : '#{component.attributes["inputMaxWidth"]}'
+ inputMinWidth : '#{component.attributes["minInputWidth"]}',
+ inputMaxWidth : '#{component.attributes["maxInputWidth"]}'
};
var events = {oneditactivation : #{this:getAsEventHandler(context, component, "oneditactivation")},
18 years, 2 months
JBoss Rich Faces SVN: r6132 - trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-18 07:57:59 -0500 (Mon, 18 Feb 2008)
New Revision: 6132
Modified:
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
bar panel calculate height
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-18 12:57:10 UTC (rev 6131)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-02-18 12:57:59 UTC (rev 6132)
@@ -331,6 +331,9 @@
},
positioning : function(inpWidth, inpHeight) {
+ this.bsPanel.style.height = inpHeight + "px";
+
+
this.bar.style.position = "absolute";
var bs = this.bar.style;
18 years, 2 months
JBoss Rich Faces SVN: r6131 - trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-18 07:57:10 -0500 (Mon, 18 Feb 2008)
New Revision: 6131
Modified:
trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
Log:
Modified: trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-18 11:43:51 UTC (rev 6130)
+++ trunk/sandbox/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/css/inplaceinput.xcss 2008-02-18 12:57:10 UTC (rev 6131)
@@ -88,7 +88,7 @@
/* mock-up styles */
- *{font-family : verdana; font-size:11px;}
+/* *{font-family : verdana; font-size:11px;} */
body{padding : 30px;}
fieldset{padding : 30px; border : 1px solid #c0c0c0;}
legend{font-weight : bold}
18 years, 2 months
JBoss Rich Faces SVN: r6129 - in trunk/ui/columns/src/main: java/org/richfaces/taglib and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-18 06:25:36 -0500 (Mon, 18 Feb 2008)
New Revision: 6129
Modified:
trunk/ui/columns/src/main/config/component/columns.xml
trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java
Log:
RF-2263 ,RF-2262
Modified: trunk/ui/columns/src/main/config/component/columns.xml
===================================================================
--- trunk/ui/columns/src/main/config/component/columns.xml 2008-02-18 10:26:37 UTC (rev 6128)
+++ trunk/ui/columns/src/main/config/component/columns.xml 2008-02-18 11:25:36 UTC (rev 6129)
@@ -115,6 +115,28 @@
<classname>java.lang.String</classname>
<description>Attribute defines a bean property which is used for sorting of a column</description>
</property>
+ <property>
+ <name>sortOrder</name>
+ <classname>org.richfaces.model.Ordering</classname>
+ <description>SortOrder is an enumeration of the possible sort orderings.</description>
+ <defaultvalue>Ordering.UNSORTED</defaultvalue>
+ </property>
+ <property>
+ <name>comparator</name>
+ <classname>java.util.Comparator</classname>
+ <description></description>
+ </property>
+ <property>
+ <name>selfSorted</name>
+ <classname>boolean</classname>
+ <description></description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>dir</name>
+ <classname>java.lang.String</classname>
+ <description></description>
+ </property>
</component>
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-02-18 10:26:37 UTC (rev 6128)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-02-18 11:25:36 UTC (rev 6129)
@@ -152,7 +152,21 @@
*/
private ValueExpression rendered = null;
+
/**
+ * Dir attr
+ */
+ private ValueExpression _dir;
+
+ /**
+ * Sets dir attr
+ * @param dir
+ */
+ public void setDir(ValueExpression dir) {
+ _dir = dir;
+ }
+
+ /**
* style CSS style(s) is/are to be applied when this component is rendered
*/
private ValueExpression _style;
@@ -306,6 +320,56 @@
private ValueExpression _sortable;
/**
+ * sortOrder SortOrder is an enumeration of the possible sort orderings.
+ */
+ private ValueExpression _sortOrder;
+
+ /**
+ * SortOrder is an enumeration of the possible sort orderings. Setter for
+ * sortOrder
+ *
+ * @param sortOrder -
+ * new value
+ */
+ public void setSortOrder(ValueExpression __sortOrder) {
+ this._sortOrder = __sortOrder;
+ }
+
+ /**
+ * selfSorted
+ *
+ */
+ private ValueExpression _selfSorted;
+
+ /**
+ *
+ * Setter for selfSorted
+ *
+ * @param selfSorted -
+ * new value
+ */
+ public void setSelfSorted(ValueExpression __selfSorted) {
+ this._selfSorted = __selfSorted;
+ }
+
+ /**
+ * comparator
+ *
+ */
+ private ValueExpression _comparator;
+
+ /**
+ *
+ * Setter for comparator
+ *
+ * @param comparator -
+ * new value
+ */
+ public void setComparator(ValueExpression __comparator) {
+ this._comparator = __comparator;
+ }
+
+ /**
* Boolean attribute. If "true" it's possible to sort the column content
* after click on the header. Default value is "true" Setter for sortable
*
@@ -553,7 +617,10 @@
column.setValueExpression("width", _width);
column.setValueExpression("sortable", _sortable);
column.setValueExpression("sortExpression", _sortExpression);
- column.setValueExpression("rendered", rendered);
+ column.setValueExpression("sortOrder", _sortOrder);
+ column.setValueExpression("comparator", _comparator);
+ column.setValueExpression("selfSorted", _selfSorted);
+ column.setValueExpression("dir", _dir);
}
/**
@@ -566,7 +633,7 @@
}
/**
- * Deletes dynamic rich columns created before
+ * Deletes dynamic rich columns created before
*/
private void deleteRichColumns() {
List<UIComponent> children = dataTable.getChildren();
18 years, 2 months
JBoss Rich Faces SVN: r6128 - in trunk/ui/progressBAR/src/main: resources/org/richfaces/renderkit/html/css and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-18 05:26:37 -0500 (Mon, 18 Feb 2008)
New Revision: 6128
Modified:
trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss
trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js
trunk/ui/progressBAR/src/main/templates/org/richfaces/progressBar.jspx
Log:
RF-2231,RF-2252 ,RF-2253 ,RF-2256,RF-2259
Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
===================================================================
--- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-02-18 09:38:41 UTC (rev 6127)
+++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-02-18 10:26:37 UTC (rev 6128)
@@ -429,7 +429,7 @@
// <div class='completeClass' id='clientId:complete' style='style'></div>
writer.startElement("div", component);
getUtils().writeAttribute(writer, "class",
- "rich-progress-bar-height rich-progress-bar-width rich-progress-bar-completed rich-progress-bar-padding " + completeClass);
+ "rich-progress-bar_height_dig rich-progress-bar-width rich-progress-bar-completed rich-progress-bar-padding " + completeClass);
getUtils().writeAttribute(writer, "id", clientId + ":complete");
getUtils().writeAttribute(writer, "style", style);
writer.endElement("div");
Modified: trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss
===================================================================
--- trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2008-02-18 09:38:41 UTC (rev 6127)
+++ trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2008-02-18 10:26:37 UTC (rev 6128)
@@ -8,6 +8,7 @@
<f:verbatim>
.rich-progress-bar-height{height : 13px;}
+ .rich-progress-bar_height_dig{height:}
.rich-progress-bar-width{width : 200px}
.rich-progress-bar-block{white-space : nowrap;}
.rich-progress-bar-uploaded{background-repeat : repeat-x;}
Modified: trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js
===================================================================
--- trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js 2008-02-18 09:38:41 UTC (rev 6127)
+++ trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js 2008-02-18 10:26:37 UTC (rev 6128)
@@ -33,13 +33,13 @@
if (data) {
this.value = data['percent'];
if (this.state == "progressState") {
- this.updateComponent(data);
- this.renderLabel(data['markup'], data['context']);
- if (this.value >= this.getMaxValue()) {
+ if (this.value > this.getMaxValue()) {
this.forceState("complete",null);
return;
}
- } else if (this.state == "initialState" && this.value >= this.getMinValue()) {
+ this.updateComponent(data);
+ this.renderLabel(data['markup'], data['context']);
+ } else if (this.state == "initialState" && this.value > this.getMinValue()) {
this.state = "progressState";
this.forceState("progressState", function () { this.poll() }.bind(this));
return;
@@ -155,7 +155,7 @@
if (!this.isAjaxMode()) {
if ( parseFloat(p) <= parseFloat(this.getMinValue())) {
this.switchState("initialState");
- }else if ( parseFloat(p) >= parseFloat(this.getMaxValue())) {
+ }else if ( parseFloat(p) > parseFloat(this.getMaxValue())) {
this.switchState("completeState");
}else {
this.switchState("progressState");
@@ -174,7 +174,6 @@
},
enable: function (ev) {
- this.disabled = false;
if (!this.isAjaxMode()) {
this.switchState("progressState");
this.setValue(0);
@@ -182,6 +181,7 @@
this.disable();
this.poll();
}
+ this.disabled = false;
},
disable: function () {
this.disabled = true;
@@ -202,6 +202,7 @@
},
renderState: function (state) {
this.state = state;
+ this.hideAll();
Element.show($(this.id + ":" + state));
},
forceState: function (state, oncomplete) {
Modified: trunk/ui/progressBAR/src/main/templates/org/richfaces/progressBar.jspx
===================================================================
--- trunk/ui/progressBAR/src/main/templates/org/richfaces/progressBar.jspx 2008-02-18 09:38:41 UTC (rev 6127)
+++ trunk/ui/progressBAR/src/main/templates/org/richfaces/progressBar.jspx 2008-02-18 10:26:37 UTC (rev 6128)
@@ -44,7 +44,7 @@
encodeClientMode(context,component,value,minValue,maxValue);
} else if (value.doubleValue() <= minValue.doubleValue()) {
encodeInitialState(context, component, true);
-} else if (value.doubleValue() >= maxValue.doubleValue()) {
+} else if (value.doubleValue() > maxValue.doubleValue()) {
encodeCompletedState(context, component, true);
} else {
encodeProgressState(context, component, true);
18 years, 2 months