Adds pomodoro counting and differentiation between long and short

breaks
camilopayan · Jul 1, 2015 · 838867f · 838867f
1 parent 68a0f68
commit 838867f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -10,6 +10,9 @@
 		<div id="time">{{ pom.timeLeft | timeify }}</div>
 		<div>Current phase: {{ pom.state ? pom.state : "STOPPED" }}</div>
 		<div><a ng-click="pom.start()">Start</a> <a ng-click="pom.cancel()">Cancel</a></div>
+		<div>
+			Poms done: {{ pom.count }}
+		</div>
 	</div>
 
 

diff --git a/js/app.js b/js/app.js
@@ -21,15 +21,16 @@ var app = angular.module("FirePom", [])
 		};
 
 		$scope.pom.cancel = function(){
+			clearTimeout();
 			$scope.pom.state = "POMODORO";
 			$scope.pom.timeLeft = settings.pomTime * 1000;
-			clearTimeout();
 		};
 
 		var finishPhase = function(){
 			switch ( $scope.pom.state ){
 				case "POMODORO":
-					if ($scope.pom.count % 4 === 0) {
+					$scope.pom.count++;
+					if ($scope.pom.count % 4 === 0 && $scope.pom.count > 0) {
 						$scope.pom.state = "LONGBREAK";
 						$scope.pom.timeLeft = settings.longRestTime * 1000;
 						break;
@@ -52,12 +53,11 @@ var app = angular.module("FirePom", [])
 				finishPhase();
 				if($scope.pom.state === "POMODORO") {
 					clearTimeout();
-				} else {
 					return;
 				}
 			}
 
-			$scope.timeoutId = $timeout( tick, 1000 );
+			$scope.pom.timeoutId = $timeout( tick, 1000 );
 		};
 
 		var clearTimeout = function(){