Merge branch 'release/1.1.1'

Author: grbsk

.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: node_js
 node_js:
   - "0.10"

README.md

@@ -1,6 +1,8 @@
-Ng-Idle  [![Build Status](https://travis-ci.org/HackedByChinese/ng-idle.png?branch=master)](https://travis-ci.org/HackedByChinese/ng-idle)
+Ng-Idle
 =======
 
+[![Join the chat at https://gitter.im/HackedByChinese/ng-idle](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/HackedByChinese/ng-idle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/HackedByChinese/ng-idle.png?branch=master)](https://travis-ci.org/HackedByChinese/ng-idle)
+
 ## About
  You may wish to detect idle users and respond, for example, to log them out so their sensitive data is protected, or taunt them, or whatever. I don't care.
 

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.1.0
+* @version v1.1.1
 * @link https://github.com/HackedByChinese/ng-idle.git
 * @license MIT
 */
@@ -275,12 +275,28 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           }
         };
 
-        $document.find('body').on(options.interrupt, function() {
-          svc.interrupt();
+        $document.find('html').on(options.interrupt, function(event) {
+          if (event.type === 'mousemove' && event.originalEvent && event.originalEvent.movementX === 0 && event.originalEvent.movementY === 0) {
+            return; // Fix for Chrome desktop notifications, triggering mousemove event.
+          }
+
+          /*
+            note:
+              webkit fires fake mousemove events when the user has done nothing, so the idle will never time out while the cursor is over the webpage
+              Original webkit bug report which caused this issue:
+                https://bugs.webkit.org/show_bug.cgi?id=17052
+              Chromium bug reports for issue:
+                https://code.google.com/p/chromium/issues/detail?id=5598
+                https://code.google.com/p/chromium/issues/detail?id=241476
+                https://code.google.com/p/chromium/issues/detail?id=317007
+          */
+          if (event.type !== 'mousemove' || angular.isUndefined(event.movementX) || (event.movementX || event.movementY)) {
+            svc.interrupt();
+          }
         });
 
         var wrap = function(event) {
-          if (event.key === 'ngIdle.expiry' && event.newValue !== event.oldValue) {
+          if (event.key === 'ngIdle.expiry' && event.newValue && event.newValue !== event.oldValue) {
             var val = angular.fromJson(event.newValue);
             if (val.id === id) return;
             svc.interrupt(true);
@@ -322,66 +338,79 @@ angular.module('ngIdle.countdown', ['ngIdle.idle'])
   }]);
 
 angular.module('ngIdle.title', [])
-  .factory('Title', ['$document', '$interpolate', function($document, $interpolate) {
+  .provider('Title', function() {
+    var options = {
+      enabled: true
+    };
+
+    var setEnabled = this.enabled = function(enabled) {
+      options.enabled = enabled === true;
+    };
 
     function padLeft(nr, n, str){
       return new Array(n-String(nr).length+1).join(str||'0')+nr;
     }
 
-    var state = {
-      original: null,
-      idle: '{{minutes}}:{{seconds}} until your session times out!',
-      timedout: 'Your session has expired.'
-    };
-
-    return {
-      original: function(val) {
-        if (angular.isUndefined(val)) return state.original;
-
-        state.original = val;
-      },
-      store: function(overwrite) {
-        if (overwrite || !state.original) state.original = this.value();
-      },
-      value: function(val) {
-        if (angular.isUndefined(val)) return $document[0].title;
-
-        $document[0].title = val;
-      },
-      idleMessage: function(val) {
-        if (angular.isUndefined(val)) return state.idle;
-
-        state.idle = val;
-      },
-      timedOutMessage: function(val) {
-        if (angular.isUndefined(val)) return state.timedout;
-
-        state.timedout = val;
-      },
-      setAsIdle: function(countdown) {
-        this.store();
-
-        var remaining = { totalSeconds: countdown };
-        remaining.minutes = Math.floor(countdown/60);
-        remaining.seconds = padLeft(countdown - remaining.minutes * 60, 2);
-
-        this.value($interpolate(this.idleMessage())(remaining));
-      },
-      setAsTimedOut: function() {
-        this.store();
+    this.$get = ['$document', '$interpolate', function($document, $interpolate) {
+      var state = {
+        original: null,
+        idle: '{{minutes}}:{{seconds}} until your session times out!',
+        timedout: 'Your session has expired.'
+      };
 
-        this.value(this.timedOutMessage());
-      },
-      restore: function() {
-        if (this.original()) this.value(this.original());
-      }
-    };
-  }])
+      return {
+        setEnabled: setEnabled,
+        isEnabled: function() {
+          return options.enabled;
+        },
+        original: function(val) {
+          if (angular.isUndefined(val)) return state.original;
+
+          state.original = val;
+        },
+        store: function(overwrite) {
+          if (overwrite || !state.original) state.original = this.value();
+        },
+        value: function(val) {
+          if (angular.isUndefined(val)) return $document[0].title;
+
+          $document[0].title = val;
+        },
+        idleMessage: function(val) {
+          if (angular.isUndefined(val)) return state.idle;
+
+          state.idle = val;
+        },
+        timedOutMessage: function(val) {
+          if (angular.isUndefined(val)) return state.timedout;
+
+          state.timedout = val;
+        },
+        setAsIdle: function(countdown) {
+          this.store();
+
+          var remaining = { totalSeconds: countdown };
+          remaining.minutes = Math.floor(countdown/60);
+          remaining.seconds = padLeft(countdown - remaining.minutes * 60, 2);
+
+          this.value($interpolate(this.idleMessage())(remaining));
+        },
+        setAsTimedOut: function() {
+          this.store();
+
+          this.value(this.timedOutMessage());
+        },
+        restore: function() {
+          if (this.original()) this.value(this.original());
+        }
+      };
+    }];
+  })
   .directive('title', ['Title', function(Title) {
       return {
         restrict: 'E',
         link: function($scope, $element, $attr) {
-          if ($attr.idleDisabled) return;
+          if (!Title.isEnabled() || $attr.idleDisabled) return;
 
           Title.store(true);
 
@@ -405,9 +434,50 @@ angular.module('ngIdle.title', [])
   }]);
 
 angular.module('ngIdle.localStorage', [])
-  .service('IdleLocalStorage', ['$window', function($window) {
-    var storage = $window.localStorage;
-    
+  .service('IdleStorageAccessor', ['$window', function($window) {
+    return {
+      get: function() {
+        return $window.localStorage;
+      }
+    }
+  }])
+  .service('IdleLocalStorage', ['IdleStorageAccessor', function(IdleStorageAccessor) {
+    function AlternativeStorage() {
+      var storageMap = {};
+
+      this.setItem = function (key, value) {
+          storageMap[key] = value;
+      };
+
+      this.getItem = function (key) {
+          if(typeof storageMap[key] !== 'undefined' ) {
+              return storageMap[key];
+          }
+          return null;
+      };
+
+      this.removeItem = function (key) {
+          storageMap[key] = undefined;
+      };
+    }
+
+    function getStorage() {
+       try {
+          var s = IdleStorageAccessor.get();
+          s.setItem('ngIdleStorage', '');
+          s.removeItem('ngIdleStorage');
+
+          return s;
+       } catch(err) {
+          return new AlternativeStorage();
+       }
+    }
+
+    // Safari, in Private Browsing Mode, looks like it supports localStorage but all calls to setItem
+    // throw QuotaExceededError. We're going to detect this and just silently drop any calls to setItem
+    // to avoid the entire page breaking, without having to do a check at each usage of Storage.
+    var storage = getStorage();
+
     return {
       set: function(key, value) {
         storage.setItem('ngIdle.'+key, angular.toJson(value));
@@ -417,8 +487,11 @@ angular.module('ngIdle.localStorage', [])
       },
       remove: function(key) {
         storage.removeItem('ngIdle.'+key);
+      },
+      _wrapped: function() {
+        return storage;
       }
     };
-  }]);
+}]);
 
 })(window, window.angular);