Skip to content

Commit b350a3c

Browse files
committed
Merge branch 'FixCallstackOverflowInReset'
2 parents 44ef454 + 4b3c58c commit b350a3c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

app/js/_timer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ var timerModule = angular.module('timer', [])
180180
tick();
181181
$scope.isRunning = false;
182182
$scope.clear();
183-
$scope.$emit('timer-reset', {
183+
$scope.$emit('timer-reseted', {
184184
timeoutId: $scope.timeoutId,
185185
millis: $scope.millis,
186186
seconds: $scope.seconds,

dist/angular-timer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* angular-timer - v1.3.5 - 2017-07-23 1:08 PM
2+
* angular-timer - v1.3.5 - 2017-07-23 2:18 PM
33
* https://github.com/siddii/angular-timer
44
*
55
* Copyright (c) 2017 Adrian Wardell
@@ -187,7 +187,7 @@ var timerModule = angular.module('timer', [])
187187
tick();
188188
$scope.isRunning = false;
189189
$scope.clear();
190-
$scope.$emit('timer-reset', {
190+
$scope.$emit('timer-reseted', {
191191
timeoutId: $scope.timeoutId,
192192
millis: $scope.millis,
193193
seconds: $scope.seconds,

dist/angular-timer.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)