Merge branch 'release/1.3.0'

Author: grbsk

angular-idle.js

@@ -1,6 +1,6 @@
 /*** Directives and services for responding to idle users in AngularJS
 * @author Mike Grabski <me@mikegrabski.com>
-* @version v1.2.2
+* @version v1.3.0
 * @link https://github.com/HackedByChinese/ng-idle.git
 * @license MIT
 */
@@ -188,6 +188,10 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           state.countdown--;
         }
 
+        function interrupted(anotherTab) {
+          $rootScope.$broadcast('IdleInterrupt', anotherTab);
+        }
+
         function timeout() {
           stopKeepalive();
           $interval.cancel(state.idle);
@@ -280,6 +284,8 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             if (options.timeout && this.isExpired()) {
               timeout();
               return;
+            } else {
+              interrupted(anotherTab);
             }
 
             // note: you can no longer auto resume once we exceed the expiry; you will reset state by calling watch() manually

angular-idle.map

@@ -1,6 +1,6 @@
 {
   "name": "ng-idle",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "homepage": "https://github.com/HackedByChinese/ng-idle",
   "description": "Responding to idle users in AngularJS",
   "main": "angular-idle.js",

angular-idle.min.js

@@ -1,6 +1,6 @@
 {
   "name": "ng-idle",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Directives and services for responding to idle users in AngularJS",
   "keywords": [
     "angularjs",

bower.json

@@ -108,6 +108,10 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           state.countdown--;
         }
 
+        function interrupted(anotherTab) {
+          $rootScope.$broadcast('IdleInterrupt', anotherTab);
+        }
+
         function timeout() {
           stopKeepalive();
           $interval.cancel(state.idle);
@@ -200,6 +204,8 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             if (options.timeout && this.isExpired()) {
               timeout();
               return;
+            } else {
+              interrupted(anotherTab);
             }
 
             // note: you can no longer auto resume once we exceed the expiry; you will reset state by calling watch() manually

package.json

@@ -406,6 +406,38 @@ describe('ngIdle', function() {
         expect(LocalStorage.set).toHaveBeenCalled();
       });
 
+      it ('interrupt() should broadcast IdleInterrupt if user has not timed out', function() {
+        spyOn($rootScope, '$broadcast');
+
+        Idle.watch();
+        Idle.interrupt();
+
+        expect($rootScope.$broadcast).toHaveBeenCalledWith('IdleInterrupt', undefined);
+      });
+
+      it ('interrupt() should broadcast IdleInterrupt from another tab', function() {
+        spyOn($rootScope, '$broadcast');
+
+        Idle.watch();
+        Idle.interrupt(true);
+
+        expect($rootScope.$broadcast).toHaveBeenCalledWith('IdleInterrupt', true);
+      });
+
+      it ('interrupt() should not broadcast IdleInterrupt if user has timed out', function() {
+        spyOn($rootScope, '$broadcast');
+
+        // fake now to return a time in the future.
+        spyOn(Idle, '_getNow').andCallFake(function() {
+          return new Date(new Date().getTime() + ((DEFAULTIDLEDURATION + DEFAULTTIMEOUT + 60) * 1000));
+        });
+
+        Idle.watch();
+        Idle.interrupt();
+
+        expect($rootScope.$broadcast).not.toHaveBeenCalledWith('IdleInterrupt');
+      });
+
       // HACK: the body event listener is only respected the first time, and thus always checks the first Idle instance we created rather than the one we created last.
       // in practice, the functionality works fine, but here the test always fails. dunno how to fix it right now.
       // it ('document event should interrupt idle timeout', function() {