Merge branch 'release/1.3.2'

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.3.1
+* @version v1.3.2
 * @link https://github.com/HackedByChinese/ng-idle.git
 * @license MIT
 */
@@ -42,17 +42,17 @@ angular.module('ngIdle.keepalive', [])
           ping: null
         };
 
-        function handleResponse(data, status) {
-          $rootScope.$broadcast('KeepaliveResponse', data, status);
+        function handleResponse(response) {
+          $rootScope.$broadcast('KeepaliveResponse', response.data, response.status);
         }
 
         function ping() {
           $rootScope.$broadcast('Keepalive');
 
           if (angular.isObject(options.http)) {
             $http(options.http)
-              .success(handleResponse)
-              .error(handleResponse);
+              .then(handleResponse)
+              .catch(handleResponse);
           }
         }
 

bower.json

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

package.json

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

src/keepalive/keepalive.js

@@ -33,17 +33,17 @@ angular.module('ngIdle.keepalive', [])
           ping: null
         };
 
-        function handleResponse(data, status) {
-          $rootScope.$broadcast('KeepaliveResponse', data, status);
+        function handleResponse(response) {
+          $rootScope.$broadcast('KeepaliveResponse', response.data, response.status);
         }
 
         function ping() {
           $rootScope.$broadcast('Keepalive');
 
           if (angular.isObject(options.http)) {
             $http(options.http)
-              .success(handleResponse)
-              .error(handleResponse);
+              .then(handleResponse)
+              .catch(handleResponse);
           }
         }
 

src/keepalive/keepalive.spec.js

@@ -104,6 +104,7 @@ describe('ngIdle', function() {
 
       beforeEach(function() {
         Keepalive = create();
+        spyOn($rootScope, '$broadcast');
       });
 
       afterEach(function() {
@@ -116,22 +117,18 @@ describe('ngIdle', function() {
         expect(create()._options().interval).toBe(100);
       });
       it('start() after a new LONGER timeout should NOT broadcast Keepalive when the default timeout expires', function() {
-        spyOn($rootScope, '$broadcast');
         Keepalive.setInterval(100 * 60);
         Keepalive.start();
         $interval.flush(DEFAULTKEEPALIVEINTERVAL);
         expect($rootScope.$broadcast).not.toHaveBeenCalledWith('Keepalive');
       });
       it('start() after a new LONGER timeout should broadcast Keepalive when the new LONGER expires', function() {
-        spyOn($rootScope, '$broadcast');
         Keepalive.setInterval(100);
         Keepalive.start();
         $interval.flush(100 * 1000);
         expect($rootScope.$broadcast).toHaveBeenCalledWith('Keepalive');
       });
       it('start() should schedule ping timeout that broadcasts Keepalive event when it expires.', function() {
-        spyOn($rootScope, '$broadcast');
-
         Keepalive.start();
 
         $interval.flush(DEFAULTKEEPALIVEINTERVAL);
@@ -140,8 +137,6 @@ describe('ngIdle', function() {
       });
 
       it('stop() should cancel ping timeout.', function() {
-        spyOn($rootScope, '$broadcast');
-
         Keepalive.start();
         Keepalive.stop();
 
@@ -151,8 +146,6 @@ describe('ngIdle', function() {
       });
 
       it('ping() should immediately broadcast Keepalive event', function() {
-        spyOn($rootScope, '$broadcast');
-
         Keepalive.ping();
 
         $interval.flush(DEFAULTKEEPALIVEINTERVAL);
@@ -161,8 +154,6 @@ describe('ngIdle', function() {
       });
 
       it('should invoke a URL when pinged and broadcast KeepaliveResponse on success.', function() {
-        spyOn($rootScope, '$broadcast');
-
         Keepalive = create('/path/to/keepalive');
 
         Keepalive.start();
@@ -178,8 +169,6 @@ describe('ngIdle', function() {
       });
 
       it('should invoke a URL when pinged and broadcast KeepaliveResponse on error.', function() {
-        spyOn($rootScope, '$broadcast');
-
         Keepalive = create('/path/to/keepalive');
 
         Keepalive.start();