Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Commit 7f03619

Browse files
committed
Merge branch 'release/1.0.1'
2 parents dff1417 + e687096 commit 7f03619

File tree

10 files changed

+28
-16
lines changed

10 files changed

+28
-16
lines changed

angular-idle.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*** Directives and services for responding to idle users in AngularJS
22
* @author Mike Grabski <me@mikegrabski.com>
3-
* @version v1.0.0
3+
* @version v1.0.1
44
* @link https://github.com/HackedByChinese/ng-idle.git
55
* @license MIT
66
*/
@@ -119,7 +119,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
119119
options.keepalive = enabled === true;
120120
};
121121

122-
this.$get = ['$interval', '$log', '$rootScope', '$document', 'Keepalive', 'LocalStorage', '$window',
122+
this.$get = ['$interval', '$log', '$rootScope', '$document', 'Keepalive', 'IdleLocalStorage', '$window',
123123
function($interval, $log, $rootScope, $document, Keepalive, LocalStorage, $window) {
124124
var state = {
125125
idle: null,
@@ -250,6 +250,8 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
250250
state.idling = false;
251251
state.running = false;
252252
setExpiry(null);
253+
254+
stopKeepalive();
253255
},
254256
interrupt: function() {
255257
if (!state.running) return;
@@ -383,7 +385,7 @@ angular.module('ngIdle.title', [])
383385
}]);
384386

385387
angular.module('ngIdle.localStorage', [])
386-
.factory('LocalStorage', ['$window', function($window) {
388+
.factory('IdleLocalStorage', ['$window', function($window) {
387389
var storage = $window.localStorage;
388390

389391
function tryParseJson(value) {

angular-idle.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)