r717 - in trunk: tests/visual ui
Author: eduardolundgren
Date: Fri Sep 19 21:09:27 2008
New Revision: 717
Modified:
trunk/tests/visual/progressbar.html
trunk/ui/ui.progressbar.js
Log:
Progressbar duration option fixed
Modified: trunk/tests/visual/progressbar.html
==============================================================================
--- trunk/tests/visual/progressbar.html (original)
+++ trunk/tests/visual/progressbar.html Fri Sep 19 21:09:27 2008
@@ -171,11 +171,11 @@
width: 500,
- duration: 5000,
+ duration: 1000,
- interval: 500,
+ interval: 1000,
- increment: 300,
+ increment: 1,
progress: function(ui) {
//console.log(ui.pixelRange);
Modified: trunk/ui/ui.progressbar.js
==============================================================================
--- trunk/ui/ui.progressbar.js (original)
+++ trunk/ui/ui.progressbar.js Fri Sep 19 21:09:27 2008
@@ -102,6 +102,10 @@
self.active = true;
+ if (options.duration < options.interval) {
+ options.duration = options.interval;
+ }
+
setTimeout(
function() {
self.active = false;
@@ -133,11 +137,14 @@
options.interval = interval - elapsedTime;
},
complete: function() {
- delete jQuery.easing[self.identifier];
- self.pause();
-
if (self.active) {
- /*TODO*/
+ options.interval = self._interval;
+ self.bar.width(0);
+ self.textElement.width(0);
+ self._animate();
+ }
+ else {
+ delete jQuery.easing[self.identifier];
}
}
}
@@ -183,8 +190,8 @@
$.ui.progressbar.defaults = {
width: 300,
- duration: 3000,
- interval: 200,
+ duration: 1000,
+ interval: 1000,
increment: 1,
range: true,
text: '',