no longer pauses when stopped directly on 50%

fixes #4 many thanks to @y-lohse
cotag · Feb 28, 2014 · 1e28ec1 · 1e28ec1
1 parent 336c53b
commit 1e28ec1
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "orbicular",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": {
     "directive": "./orbicular/orbicular.js",
     "style":     "./orbicular/orbicular.scss",

diff --git a/orbicular/orbicular.js b/orbicular/orbicular.js
@@ -101,14 +101,14 @@
                     scope.$watch('current', function (newValue) {
                         newValue = newValue / scope.total * 360;
 
-                        if (newValue > 180 && !scope.nextHalf) {
+                        if (newValue >= 180 && !scope.nextHalf) {
                             progressTemp = newValue;
                             if (applyProgress) {
                                 applyProgress = false;
                                 updateProgress(180);
                                 progressEl.bind(transitionEvents, moveForward);
                             }
-                        } else if (newValue <= 180 && scope.nextHalf) {
+                        } else if (newValue < 180 && scope.nextHalf) {
                             progressTemp = newValue;
                             if (!applyProgress) {
                                 applyProgress = true;

diff --git a/test/spec/orbicularSpec.js b/test/spec/orbicularSpec.js
@@ -81,6 +81,72 @@ describe('Orbicular:orbicular (directive)', function() {
         expect(degrees).toBe(200);
     }));
 
+    it('should transition when stopping at 50% going forward', inject(function($rootScope) {
+        // move progress bar to half way
+        $rootScope.progress = 180;
+        $rootScope.$digest();
+
+        expect($rootScope.progress).toBe(180);
+        degrees = findDegrees(bar);
+        expect(degrees).toBe(180);      // stops here to transition the graphic
+
+        // the animation end event should move the progress forward
+        bar.trigger('transitionend');
+        $rootScope.$digest();
+
+        // move progress bar past half way
+        $rootScope.progress = 200;
+        $rootScope.$digest();
+
+        expect($rootScope.progress).toBe(200);
+        degrees = findDegrees(bar);
+        expect(degrees).toBe(200);      // stops here to transition the graphic
+
+        // the animation end event should move the progress forward
+        bar.trigger('transitionend');
+        $rootScope.$digest();
+
+        expect($rootScope.progress).toBe(200);
+        degrees = findDegrees(bar);
+        expect(degrees).toBe(200);
+    }));
+
+    it('should transition when stopping at 50% going backwards', inject(function($rootScope) {
+        // move progress bar past half way
+        $rootScope.progress = 200;
+        $rootScope.$digest();
+
+        bar.trigger('transitionend');
+        $rootScope.$digest();
+
+        expect($rootScope.progress).toBe(200);
+        degrees = findDegrees(bar);
+        expect(degrees).toBe(200);
+
+
+        // Move back to 50%
+        $rootScope.progress = 180;
+        $rootScope.$digest();
+
+        bar.trigger('transitionend');
+        $rootScope.$digest();
+
+        expect($rootScope.progress).toBe(180);
+        degrees = findDegrees(bar);
+        expect(degrees).toBe(180);
+
+        // Move backwards
+        $rootScope.progress = 50;
+        $rootScope.$digest();
+
+        bar.trigger('transitionend');
+        $rootScope.$digest();
+
+        expect($rootScope.progress).toBe(50);
+        degrees = findDegrees(bar);
+        expect(degrees).toBe(50);
+    }));
+
     it('should smoothly animate the transition backwards from one side to the other', inject(function($rootScope) {
         // move progress bar past half way
         $rootScope.progress = 200;