4:26 a.m.
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);