Browse Source

Fix issue with next timer not being removed on complete

api-progress
Jack Lukic 9 years ago
parent
commit
a6c03f8565
1 changed files with 6 additions and 2 deletions
  1. 8
      src/definitions/modules/progress.js

8
src/definitions/modules/progress.js

@ -93,8 +93,8 @@ $.fn.progress = function(parameters) {
}, },
complete: function() { complete: function() {
module.remove.progressPoll();
if(module.percent === undefined || module.percent < 100) { if(module.percent === undefined || module.percent < 100) {
module.remove.progressPoll();
module.set.percent(100); module.set.percent(100);
} }
}, },
@ -327,7 +327,10 @@ $.fn.progress = function(parameters) {
remove: { remove: {
progressPoll: function() { progressPoll: function() {
module.verbose('Removing progress poll timer'); module.verbose('Removing progress poll timer');
delete module.progressPoll;
if(module.progressPoll) {
clearTimeout(module.progressPoll);
delete module.progressPoll;
}
}, },
nextValue: function() { nextValue: function() {
module.verbose('Removing progress value stored for next update'); module.verbose('Removing progress value stored for next update');
@ -459,6 +462,7 @@ $.fn.progress = function(parameters) {
else { else {
module.verbose('Reached 100% removing active state'); module.verbose('Reached 100% removing active state');
module.remove.active(); module.remove.active();
module.remove.progressPoll();
} }
} }
else if(percent > 0) { else if(percent > 0) {

Loading…
Cancel
Save