Skip to content
Permalink
Browse files

Progressbar duration option fixed

  • Loading branch information...
eduardolundgren committed Sep 20, 2008
1 parent a522291 commit 2f842cedd686ebe2b8a795ff60115b9a473e46b5
Showing with 16 additions and 9 deletions.
  1. +3 −3 tests/visual/progressbar.html
  2. +13 −6 ui/ui.progressbar.js
@@ -171,11 +171,11 @@ <h1>jQuery - ProgressBar</h1>
width: 500,
duration: 5000,
duration: 1000,
interval: 500,
interval: 1000,
increment: 300,
increment: 1,
progress: function(ui) {
//console.log(ui.pixelRange);
@@ -102,6 +102,10 @@ $.widget("ui.progressbar", {

self.active = true;

if (options.duration < options.interval) {
options.duration = options.interval;
}

setTimeout(
function() {
self.active = false;
@@ -133,11 +137,14 @@ $.widget("ui.progressbar", {
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 @@ $.widget("ui.progressbar", {

$.ui.progressbar.defaults = {
width: 300,
duration: 3000,
interval: 200,
duration: 1000,
interval: 1000,
increment: 1,
range: true,
text: '',

0 comments on commit 2f842ce

Please sign in to comment.
You can’t perform that action at this time.