Merge branch 'release/1.0.2'

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.0.1
+* @version v1.0.2
 * @link https://github.com/HackedByChinese/ng-idle.git
 * @license MIT
 */
@@ -129,6 +129,8 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           countdown: null
         };
 
+        var id = new Date().getTime();
+
         function startKeepalive() {
           if (!options.keepalive) return;
 
@@ -196,12 +198,14 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
         }
 
         function getExpiry() {
-          return LocalStorage.get('expiry');
+          var obj = LocalStorage.get('expiry');
+
+          return obj.time;
         }
 
         function setExpiry(date) {
           if (!date) LocalStorage.remove('expiry');
-          else LocalStorage.set('expiry', date);
+          else LocalStorage.set('expiry', {id: id, time: date});
         }
 
         var svc = {
@@ -227,13 +231,13 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           idling: function() {
             return state.idling;
           },
-          watch: function() {
+          watch: function(noExpiryUpdate) {
             $interval.cancel(state.idle);
             $interval.cancel(state.timeout);
 
             // calculate the absolute expiry date, as added insurance against a browser sleeping or paused in the background
             var timeout = !options.timeout ? 0 : options.timeout;
-            setExpiry(new Date(new Date().getTime() + ((options.idle + timeout) * 1000)));
+            if (!noExpiryUpdate) setExpiry(new Date(new Date().getTime() + ((options.idle + timeout) * 1000)));
 
 
             if (state.idling) toggleState(); // clears the idle state if currently idling
@@ -253,7 +257,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
 
             stopKeepalive();
           },
-          interrupt: function() {
+          interrupt: function(noExpiryUpdate) {
             if (!state.running) return;
 
             if (options.timeout && this.isExpired()) {
@@ -262,7 +266,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             }
 
             // note: you can no longer auto resume once we exceed the expiry; you will reset state by calling watch() manually
-            if (options.autoResume === 'idle' || (options.autoResume === 'notIdle' && !state.idling)) this.watch();
+            if (options.autoResume === 'idle' || (options.autoResume === 'notIdle' && !state.idling)) this.watch(noExpiryUpdate);
           }
         };
 
@@ -271,7 +275,11 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
         });
 
         var wrap = function(event) {
-          if (event.key === 'ngIdle.expiry') svc.interrupt();
+          if (event.key === 'ngIdle.expiry' && event.newValue !== event.oldValue) {
+            var val = LocalStorage.parseJson(event.newValue);
+            if (val.id === id) return;
+            svc.interrupt(true);
+          }
         };
 
         if ($window.addEventListener) $window.addEventListener('storage', wrap, false);
@@ -412,6 +420,9 @@ angular.module('ngIdle.localStorage', [])
       },
       remove: function(key) {
         storage.removeItem('ngIdle.'+key);
+      },
+      parseJson: function(raw) {
+        return tryParseJson(raw);
       }
     };
   }]);