From e956a8c3fd8c52435229845ed727a7b84710f358 Mon Sep 17 00:00:00 2001 From: Atef Ben Ali Date: Thu, 23 Nov 2017 14:41:02 +0100 Subject: [PATCH 1/3] upgrade momentjs to v2.11.2 see https://github.com/siddii/angular-timer/issues/327 --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index b33b533..bdb2211 100644 --- a/bower.json +++ b/bower.json @@ -10,7 +10,7 @@ }, "dependencies": { "angular": ">= 1.0.7", - "moment": "~2.9.0", + "moment": "~2.11.2", "humanize-duration": "~3.10.0" }, "devDependencies": { From 338b665ed5d369605b2fb1a8be096654b4b97fbb Mon Sep 17 00:00:00 2001 From: Viktor Manchak Date: Thu, 18 Jan 2018 14:51:41 +0200 Subject: [PATCH 2/3] Timer with predefined end time didn't resume from stopped time.Solution: update endTime when resume() is called. --- dist/angular-timer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/angular-timer.js b/dist/angular-timer.js index 908965c..f927ebb 100644 --- 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', { From 7d18742f991aa7f9ee27dddb34836c83c62e5c08 Mon Sep 17 00:00:00 2001 From: Stavros Korokithakis Date: Sat, 8 Dec 2018 02:24:38 +0200 Subject: [PATCH 3/3] Add CS badge --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 611887d..83f19f6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -## angular-timer — A simple, re-usable, inter-operable timer directive [![Build Status](https://travis-ci.org/siddii/angular-timer.png)](https://travis-ci.org/siddii/angular-timer) +## angular-timer — A simple, re-usable, inter-operable timer directive + +[![Build Status](https://travis-ci.org/siddii/angular-timer.png)](https://travis-ci.org/siddii/angular-timer) +[![](https://www.codeshelter.co/static/badges/badge-flat.svg)](https://www.codeshelter.co/) ### Getting started With any of the following options...