[release]

Author: iambrosi

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "angular-recaptcha",
-    "version": "2.2.4",
+    "version": "2.2.5",
     "keywords": ["angular", "captcha", "recaptcha", "vividcortex", "human", "form", "validation", "signup", "security", "login"],
     "main": "release/angular-recaptcha.js",
     "ignore": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-recaptcha",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "An AngularJS module to ease usage of reCaptcha inside a form",
   "author": "VividCortex",
   "license": "MIT",

release/angular-recaptcha.js

@@ -1,5 +1,5 @@
 /**
- * angular-recaptcha build:2015-06-22 
+ * angular-recaptcha build:2015-08-26 
  * https://github.com/vividcortex/angular-recaptcha 
  * Copyright (c) 2015 VividCortex 
 **/
@@ -133,6 +133,7 @@
 
                 scope.widgetId = null;
 
+                var sessionTimeout;
                 var removeCreationListener = scope.$watch('key', function (key) {
                     if (!key) {
                         return;
@@ -154,7 +155,7 @@
                         });
 
                         // captcha session lasts 2 mins after set.
-                        $timeout(function (){
+                        sessionTimeout = $timeout(function (){
                             if(ctrl){
                                 ctrl.$setValidity('recaptcha',false);
                             }
@@ -178,14 +179,27 @@
                         scope.widgetId = widgetId;
                         scope.onCreate({widgetId: widgetId});
 
-                        scope.$on('$destroy', cleanup);
+                        scope.$on('$destroy', destroy);
 
                     });
 
                     // Remove this listener to avoid creating the widget more than once.
                     removeCreationListener();
                 });
 
+                function destroy() {
+                  if (ctrl) {
+                    // reset the validity of the form if we were removed
+                    ctrl.$setValidity('recaptcha', null);
+                  }
+                  if (sessionTimeout) {
+                    // don't trigger the session timeout if we are no longer active
+                    $timeout.cancel(sessionTimeout);
+                    sessionTimeout = null;
+                  }
+                  cleanup();
+                }
+
                 function cleanup(){
                   // removes elements reCaptcha added.
                   angular.element($document[0].querySelectorAll('.pls-container')).parent().remove();