fix(idle): use expiry.now() if expiry.last() returns null

fixes #54
grbsk · May 30, 2017 · 06fcb36 · 06fcb36
1 parent a90c226
commit 06fcb36
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/modules/core/src/idle.spec.ts b/modules/core/src/idle.spec.ts
@@ -346,6 +346,21 @@ describe('core/Idle', () => {
         instance.stop();
       }));
 
+      it('emits an onIdleStart event if there was no "last" expiry set.', fakeAsync(() => {
+        spyOn(instance.onIdleStart, 'emit').and.callThrough();
+
+        expiry.mockNow = new Date();
+        instance.watch();
+
+        expiry.mockNow = new Date(expiry.now().getTime() + instance.getIdle() * 1000);
+        expiry.last(null);
+        tick(3000);
+
+        expect(instance.onIdleStart.emit).toHaveBeenCalledTimes(1);
+
+        instance.stop();
+      }));
+
       it('emits an onIdleEnd event when the user returns from idle', fakeAsync(() => {
         spyOn(instance.onIdleEnd, 'emit').and.callThrough();
 

diff --git a/modules/core/src/idle.ts b/modules/core/src/idle.ts
@@ -236,7 +236,8 @@ export class Idle implements OnDestroy {
 
     let watchFn = () => {
       let now: Date = this.expiry.now();
-      let diff: Number = this.expiry.last().getTime() - now.getTime() - (timeout * 1000);
+      let last: Date = this.expiry.last() || now;
+      let diff: Number = last.getTime() - now.getTime() - (timeout * 1000);
       if (diff > 0) {
         this.safeClearInterval('idleHandle');
         this.idleHandle = setInterval(watchFn, diff);
@@ -346,7 +347,8 @@ export class Idle implements OnDestroy {
   private doCountdown(): void {
     let timeout = !this.timeoutVal ? 0 : this.timeoutVal;
     let now: Date = this.expiry.now();
-    let diff: Number = this.expiry.last().getTime() - now.getTime() - (timeout * 1000);
+    let last: Date = this.expiry.last() || now;
+    let diff: Number = last.getTime() - now.getTime() - (timeout * 1000);
     if (diff > 0) {
       this.safeClearInterval('timeoutHandle');
       this.interrupt(true);