Merge remote-tracking branch 'origin/develop' into battmanz-develop

Conflicts: angular-idle.map angular-idle.min.js
mbrand · Apr 20, 2015 · eafcfc1 · eafcfc1
2 parents 8966ba5 + d8ba436
commit eafcfc1
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 72 deletions.
diff --git a/angular-idle.js b/angular-idle.js
@@ -42,7 +42,6 @@ angular.module('ngIdle.keepalive', [])
           ping: null
         };
 
-
         function handleResponse(data, status) {
           $rootScope.$broadcast('KeepaliveResponse', data, status);
         }
@@ -215,6 +214,12 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           _getNow: function() {
             return new Date();
           },
+          getIdle: function(){
+            return options.idle;
+          },
+          getTimeout: function(){
+            return options.timeout;
+          },
           setIdle: function(seconds) {
             changeOption(this, setIdle, seconds);
           },
@@ -290,7 +295,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
     ];
   });
 
-angular.module('ngIdle.countdown', [])
+angular.module('ngIdle.countdown', ['ngIdle.idle'])
   .directive('idleCountdown', ['Idle', function(Idle) {
     return {
       restrict: 'A',
@@ -380,6 +385,10 @@ angular.module('ngIdle.title', [])
 
           Title.store(true);
 
+          $scope.$on('IdleStart', function(e) {
+            Title.original($element[0].innerText);
+          });
+
           $scope.$on('IdleWarn', function(e, countdown) {
             Title.setAsIdle(countdown);
           });

diff --git a/angular-idle.map b/angular-idle.map