Skip to content

Commit fdbf37f

Browse files
siddiisiddii
authored
Merge pull request #297 from webconnex/master
Fix #125 - Invalid argument on IE
2 parents 68a60f9 + 6c51bce commit fdbf37f

4 files changed

Lines changed: 22 additions & 24 deletions

File tree

‎app/js/_timer.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ var timerModule = angular.module('timer', [])
114114
}
115115
});
116116

117-
$scope.start = $element[0].start = function () {
117+
$scope.start = function () {
118118
$scope.startTime = $scope.startTimeAttr ? moment($scope.startTimeAttr) : moment();
119119
$scope.endTime = $scope.endTimeAttr ? moment($scope.endTimeAttr) : null;
120120
if (!angular.isNumber($scope.countdown)) {
@@ -125,7 +125,7 @@ var timerModule = angular.module('timer', [])
125125
$scope.isRunning = true;
126126
};
127127

128-
$scope.resume = $element[0].resume = function () {
128+
$scope.resume = function () {
129129
resetTimeout();
130130
if ($scope.countdownattr) {
131131
$scope.countdown += 1;
@@ -135,21 +135,21 @@ var timerModule = angular.module('timer', [])
135135
$scope.isRunning = true;
136136
};
137137

138-
$scope.stop = $scope.pause = $element[0].stop = $element[0].pause = function () {
138+
$scope.stop = $scope.pause = function () {
139139
var timeoutId = $scope.timeoutId;
140140
$scope.clear();
141141
$scope.$emit('timer-stopped', {timeoutId: timeoutId, millis: $scope.millis, seconds: $scope.seconds, minutes: $scope.minutes, hours: $scope.hours, days: $scope.days});
142142
};
143143

144-
$scope.clear = $element[0].clear = function () {
144+
$scope.clear = function () {
145145
// same as stop but without the event being triggered
146146
$scope.stoppedTime = moment();
147147
resetTimeout();
148148
$scope.timeoutId = null;
149149
$scope.isRunning = false;
150150
};
151151

152-
$scope.reset = $element[0].reset = function () {
152+
$scope.reset = function () {
153153
$scope.startTime = $scope.startTimeAttr ? moment($scope.startTimeAttr) : moment();
154154
$scope.endTime = $scope.endTimeAttr ? moment($scope.endTimeAttr) : null;
155155
$scope.countdown = angular.isNumber($scope.countdownattr) && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
@@ -249,7 +249,7 @@ var timerModule = angular.module('timer', [])
249249
if ($scope.countdownattr) {
250250
$scope.millis = $scope.countdownattr * 1000;
251251

252-
$scope.addCDSeconds = $element[0].addCDSeconds = function (extraSeconds) {
252+
$scope.addCDSeconds = function (extraSeconds) {
253253
$scope.countdown += extraSeconds;
254254
$scope.$digest();
255255
if (!$scope.isRunning) {
@@ -310,7 +310,7 @@ var timerModule = angular.module('timer', [])
310310
$scope.$digest();
311311
}, $scope.interval - adjustment);
312312

313-
$scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis, timerElement: $element[0]});
313+
$scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis});
314314

315315
if ($scope.countdown > 0) {
316316
$scope.countdown--;

‎dist/angular-timer.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
/**
2-
* angular-timer - v1.3.4 - 2016-05-01 9:52 PM
2+
* angular-timer - v1.3.5 - 2017-02-14 1:19 PM
33
* https://github.com/siddii/angular-timer
44
*
5-
* Copyright (c) 2016 Siddique Hameed
5+
* Copyright (c) 2017 Adrian Wardell
66
* Licensed MIT <https://github.com/siddii/angular-timer/blob/master/LICENSE.txt>
77
*/
8-
var humanizeDuration = require("humanize-duration");
9-
var moment = require("moment");
108
var timerModule = angular.module('timer', [])
119
.directive('timer', ['$compile', function ($compile) {
1210
return {
@@ -123,7 +121,7 @@ var timerModule = angular.module('timer', [])
123121
}
124122
});
125123

126-
$scope.start = $element[0].start = function () {
124+
$scope.start = function () {
127125
$scope.startTime = $scope.startTimeAttr ? moment($scope.startTimeAttr) : moment();
128126
$scope.endTime = $scope.endTimeAttr ? moment($scope.endTimeAttr) : null;
129127
if (!angular.isNumber($scope.countdown)) {
@@ -134,7 +132,7 @@ var timerModule = angular.module('timer', [])
134132
$scope.isRunning = true;
135133
};
136134

137-
$scope.resume = $element[0].resume = function () {
135+
$scope.resume = function () {
138136
resetTimeout();
139137
if ($scope.countdownattr) {
140138
$scope.countdown += 1;
@@ -144,21 +142,21 @@ var timerModule = angular.module('timer', [])
144142
$scope.isRunning = true;
145143
};
146144

147-
$scope.stop = $scope.pause = $element[0].stop = $element[0].pause = function () {
145+
$scope.stop = $scope.pause = function () {
148146
var timeoutId = $scope.timeoutId;
149147
$scope.clear();
150148
$scope.$emit('timer-stopped', {timeoutId: timeoutId, millis: $scope.millis, seconds: $scope.seconds, minutes: $scope.minutes, hours: $scope.hours, days: $scope.days});
151149
};
152150

153-
$scope.clear = $element[0].clear = function () {
151+
$scope.clear = function () {
154152
// same as stop but without the event being triggered
155153
$scope.stoppedTime = moment();
156154
resetTimeout();
157155
$scope.timeoutId = null;
158156
$scope.isRunning = false;
159157
};
160158

161-
$scope.reset = $element[0].reset = function () {
159+
$scope.reset = function () {
162160
$scope.startTime = $scope.startTimeAttr ? moment($scope.startTimeAttr) : moment();
163161
$scope.endTime = $scope.endTimeAttr ? moment($scope.endTimeAttr) : null;
164162
$scope.countdown = angular.isNumber($scope.countdownattr) && parseInt($scope.countdownattr, 10) > 0 ? parseInt($scope.countdownattr, 10) : undefined;
@@ -258,7 +256,7 @@ var timerModule = angular.module('timer', [])
258256
if ($scope.countdownattr) {
259257
$scope.millis = $scope.countdownattr * 1000;
260258

261-
$scope.addCDSeconds = $element[0].addCDSeconds = function (extraSeconds) {
259+
$scope.addCDSeconds = function (extraSeconds) {
262260
$scope.countdown += extraSeconds;
263261
$scope.$digest();
264262
if (!$scope.isRunning) {
@@ -319,7 +317,7 @@ var timerModule = angular.module('timer', [])
319317
$scope.$digest();
320318
}, $scope.interval - adjustment);
321319

322-
$scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis, timerElement: $element[0]});
320+
$scope.$emit('timer-tick', {timeoutId: $scope.timeoutId, millis: $scope.millis});
323321

324322
if ($scope.countdown > 0) {
325323
$scope.countdown--;

0 commit comments

Comments
 (0)