Merge pull request #331 from ideapad/hotfix/resume-timer-with-predefined-endtime

skorokithakis · web-flow · commit d58fbf8c3325 · 2018-12-08T02:26:41.000+02:00
Timer with predefined endTime doesn't resume from stoppedTime
diff --git a/dist/angular-timer.js b/dist/angular-timer.js
@@ -146,6 +146,7 @@ var timerModule = angular.module('timer', [])
             $scope.countdown += 1;
           }
           $scope.startTime = moment().diff((moment($scope.stoppedTime).diff(moment($scope.startTime))));
+          $scope.endTime += moment().diff(moment($scope.stoppedTime));
           tick();
           $scope.isRunning = true;
           $scope.$emit('timer-started', {

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ var timerModule = angular.module('timer', [])`
`146`	`146`	`$scope.countdown += 1;`
`147`	`147`	`}`
`148`	`148`	`$scope.startTime = moment().diff((moment($scope.stoppedTime).diff(moment($scope.startTime))));`
	`149`	`+ $scope.endTime += moment().diff(moment($scope.stoppedTime));`
`149`	`150`	`tick();`
`150`	`151`	`$scope.isRunning = true;`
`151`	`152`	`$scope.$emit('timer-started', {`