From f4eaacef8d0f1689b6399a450387e06748765d3f Mon Sep 17 00:00:00 2001
From: Markus Coetzee <mks.coetzee@gmail.com>
Date: Mon, 29 Dec 2014 13:10:33 +0200
Subject: [PATCH] Prevent loading bar from moving backwards

---
 src/loading-bar.js | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/loading-bar.js b/src/loading-bar.js
index 97c6ebe..cb7209f 100644
--- a/src/loading-bar.js
+++ b/src/loading-bar.js
@@ -178,10 +178,6 @@ angular.module('cfp.loadingBar', [])
        * Inserts the loading bar element into the dom, and sets it to 2%
        */
       function _start() {
-        if (!$animate) {
-          $animate = $injector.get('$animate');
-        }
-
         var $parent = $document.find($parentSelector).eq(0);
         $timeout.cancel(completeTimeout);
 
@@ -193,6 +189,7 @@ angular.module('cfp.loadingBar', [])
         $rootScope.$broadcast('cfpLoadingBar:started');
         started = true;
 
+        $animate = _getAnimate();
         if (includeBar) {
           $animate.enter(loadingBarContainer, $parent);
         }
@@ -213,9 +210,11 @@ angular.module('cfp.loadingBar', [])
         if (!started) {
           return;
         }
-        var pct = (n * 100) + '%';
-        loadingBar.css('width', pct);
-        status = n;
+        if (status < n) {
+          var pct = (n * 100) + '%';
+          loadingBar.css('width', pct);
+          status = n;
+        }
 
         // increment loadingbar to give the illusion that there is always
         // progress but make sure to cancel the previous timeouts so we don't
@@ -232,6 +231,11 @@ angular.module('cfp.loadingBar', [])
        */
       function _inc() {
         if (_status() >= 1) {
+          var promise = _getAnimate().leave(loadingBarContainer, _completeAnimation);
+          if (promise && promise.then) {
+            promise.then(_completeAnimation);
+          }
+          $rootScope.$broadcast('cfpLoadingBar:completed');
           return;
         }
 
@@ -271,25 +275,22 @@ angular.module('cfp.loadingBar', [])
       }
 
       function _complete() {
-        if (!$animate) {
-          $animate = $injector.get('$animate');
-        }
-
-        $rootScope.$broadcast('cfpLoadingBar:completed');
-        _set(1);
-
         $timeout.cancel(completeTimeout);
 
         // Attempt to aggregate any start/complete calls within 500ms:
         completeTimeout = $timeout(function() {
-          var promise = $animate.leave(loadingBarContainer, _completeAnimation);
-          if (promise && promise.then) {
-            promise.then(_completeAnimation);
-          }
-          $animate.leave(spinner);
+          _set(1);
+          _getAnimate().leave(spinner);
         }, 500);
       }
 
+      function _getAnimate() {
+        if (!$animate) {
+          $animate = $injector.get('$animate');
+        }
+        return $animate;
+      }
+
       return {
         start            : _start,
         set              : _set,