Merge branch 'release/1.2.1'

grbsk · Apr 23, 2016 · 3e1bcc0 · 3e1bcc0
2 parents ac5f51d + 6d440e8
commit 3e1bcc0
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/angular-idle.js b/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.0
+* @version v1.2.1
 * @link https://github.com/HackedByChinese/ng-idle.git
 * @license MIT
 */
@@ -151,9 +151,10 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
 
         function toggleState() {
           state.idling = !state.idling;
-          var name = state.idling ? 'Start' : 'End';
+          var name = state.idling ? 'IdleStart' : 'IdleEnd';
 
           if (state.idling) {
+            $rootScope.$broadcast(name);
             stopKeepalive();
             if (options.timeout) {
               state.countdown = options.timeout;
@@ -162,10 +163,9 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             }
           } else {
             startKeepalive();
+            $rootScope.$broadcast(name);
           }
 
-          $rootScope.$broadcast('Idle' + name);
-
           $interval.cancel(state.idle);
         }
 

diff --git a/angular-idle.map b/angular-idle.map
diff --git a/angular-idle.min.js b/angular-idle.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-idle",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "homepage": "https://github.com/HackedByChinese/ng-idle",
   "description": "Responding to idle users in AngularJS",
   "main": "angular-idle.js",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-idle",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Directives and services for responding to idle users in AngularJS",
   "keywords": [
     "angularjs",
@@ -12,7 +12,7 @@
     "user",
     "session"
   ],
-  "main": "angular-idle.js",
+  "main": "index.js",
   "scripts": {
     "test": "grunt test"
   },

diff --git a/src/idle/idle.js b/src/idle/idle.js
@@ -71,9 +71,10 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
 
         function toggleState() {
           state.idling = !state.idling;
-          var name = state.idling ? 'Start' : 'End';
+          var name = state.idling ? 'IdleStart' : 'IdleEnd';
 
           if (state.idling) {
+            $rootScope.$broadcast(name);
             stopKeepalive();
             if (options.timeout) {
               state.countdown = options.timeout;
@@ -82,10 +83,9 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             }
           } else {
             startKeepalive();
+            $rootScope.$broadcast(name);
           }
 
-          $rootScope.$broadcast('Idle' + name);
-
           $interval.cancel(state.idle);
         }
 

diff --git a/src/idle/idle.spec.js b/src/idle/idle.spec.js
@@ -257,6 +257,18 @@ describe('ngIdle', function() {
         expect(Keepalive.stop).toHaveBeenCalled();
       });
 
+      it('should broadcast IdleStart then IdleWarn', function() {
+        spyOn($rootScope, '$broadcast');
+
+        Idle.watch();
+
+        $interval.flush(DEFAULTIDLEDURATION);
+        $rootScope.$digest();
+
+        expect($rootScope.$broadcast).toHaveBeenCalledWith('IdleStart');
+        expect($rootScope.$broadcast.mostRecentCall.args[0]).toBe('IdleWarn');
+      });
+
       it('should broadcast IdleEnd, start keepalive and ping', function() {
         spyOn($rootScope, '$broadcast');