Merge pull request #393 from canjs/391-fix-loading-indicator

Fix bug preventing loading indicator from showing

Author: imaustink

static/loading-bar.js

@@ -1,5 +1,5 @@
 function LoadingBar(color, parent) {
-  this.meter = $('<span>', {style: 'transition: width 1s ease; width:0%;'});
+  this.meter = $('<span>', {style: 'transition: width 0.5s ease; width:0%;'});
   this.elem = $('<div>', {style: 'display:none', class: 'meter animate ' + color}).append(
     this.meter.append($('<span>'))
   );
@@ -10,18 +10,32 @@ function LoadingBar(color, parent) {
   return this;
 }
 
-LoadingBar.prototype.start = function(percentage) {
-  percentage = percentage || 0;
-  this.meter.css('width', percentage + '%');
+LoadingBar.prototype.start = function(progress) {
+  progress = progress || 5;
+  this.clearTimer();
+  this.meter.css('width', progress + '%');
   this.elem.show();
 };
 
 LoadingBar.prototype.end = function() {
-  this.elem.hide();
+  this.update(100);
 };
 
-LoadingBar.prototype.update = function(percentage) {
-  this.meter.css('width', percentage + '%');
+LoadingBar.prototype.update = function(progress) {
+  this.clearTimer();
+  this.meter.css('width', progress + '%');
+  if(progress === 100){
+    this.timer = setTimeout(function(){
+      this.elem.hide();
+    }.bind(this), 500);
+  }
+};
+
+LoadingBar.prototype.clearTimer = function(){
+  if(this.timer){
+    clearTimeout(this.timer);
+    this.timer = null;
+  }
 };
 
 module.exports = LoadingBar;