Skip to content

Commit 6179289

Browse files
authored
Merge pull request siddii#321 from CodeFunta/FixCallstackOverflowInReset
Fix callstack overflow in reset
2 parents 5ffe343 + 4b3c58c commit 6179289

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

app/js/_timer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ var timerModule = angular.module('timer', [])
180180
tick();
181181
$scope.isRunning = false;
182182
$scope.clear();
183-
$scope.$emit('timer-reset', {
184-
timeoutId: timeoutId,
183+
$scope.$emit('timer-reseted', {
184+
timeoutId: $scope.timeoutId,
185185
millis: $scope.millis,
186186
seconds: $scope.seconds,
187187
minutes: $scope.minutes,

dist/angular-timer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* angular-timer - v1.3.5 - 2017-03-09 2:18 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,8 +187,8 @@ var timerModule = angular.module('timer', [])
187187
tick();
188188
$scope.isRunning = false;
189189
$scope.clear();
190-
$scope.$emit('timer-reset', {
191-
timeoutId: timeoutId,
190+
$scope.$emit('timer-reseted', {
191+
timeoutId: $scope.timeoutId,
192192
millis: $scope.millis,
193193
seconds: $scope.seconds,
194194
minutes: $scope.minutes,

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)