Grecaptcha now prevents validator from skipping hidden input victorjonsson#399

Author: victorjonsson

src/modules/security.js

@@ -530,64 +530,61 @@
         return this;
     };
 
-    var setupGooglereCaptcha = function (evt, $forms, config)
-    {
-        if( typeof grecaptcha !== typeof undefined && !$.formUtils.hasLoadedGrecaptcha ){
-            throw new Error('reCaptcha API can not be loaded by hand, delete reCaptcha API snippet.');
-        } else if(!$.formUtils.hasLoadedGrecaptcha)
-        {
-            $.formUtils.hasLoadedGrecaptcha = true;
-
-            var src = '//www.google.com/recaptcha/api.js?onload=reCaptchaLoaded&render=explicit' + (config.lang ? '&hl=' + config.lang : '');
-            var script = document.createElement('script');
-            script.type = 'text/javascript';
-            script.async = true;
-            script.defer = true;
-            script.src = src;
-            document.getElementsByTagName('body')[0].appendChild(script);
-        }
-    };
-
-    window.reCaptchaLoaded = function ()
-    {
-        var $forms = $('form');
-
-        if (!$forms.each)
-        {
-            $forms = $($forms);
+  var setupGooglereCaptcha = function (evt, $forms, config) {
+    if (typeof grecaptcha !== typeof undefined && !$.formUtils.hasLoadedGrecaptcha) {
+      throw new Error('reCaptcha API can not be loaded by hand, delete reCaptcha API snippet.');
+    } else if (!$.formUtils.hasLoadedGrecaptcha) {
+      $.formUtils.hasLoadedGrecaptcha = true;
+
+      var src = '//www.google.com/recaptcha/api.js?onload=reCaptchaLoaded&render=explicit' + (config.lang ? '&hl=' + config.lang : '');
+      var script = document.createElement('script');
+      script.type = 'text/javascript';
+      script.async = true;
+      script.defer = true;
+      script.src = src;
+      document.getElementsByTagName('body')[0].appendChild(script);
+    }
+  };
+
+  window.reCaptchaLoaded = function ($forms) {
+    if (!$forms || typeof $forms) {
+      $forms = $('form');
+    }
+
+    $forms.each(function () {
+      var $form = $(this),
+        config = $form.context.validationConfig;
+
+      $('[data-validation~="recaptcha"]', $form).each(function () {
+        var $input = $(this),
+          div = document.createElement('DIV'),
+          siteKey = config.reCaptchaSiteKey || $input.valAttr('recaptcha-sitekey'),
+          theme = config.reCaptchaTheme || $input.valAttr('recaptcha-theme') || 'light';
+
+        if (!siteKey) {
+          throw new Error('Google reCaptcha site key is required.');
         }
 
-        $forms.each(function ()
-        {
-            var $form = $(this),
-                config = $form.context.validationConfig;
-
-            $('[data-validation~="recaptcha"]', $form).each(function ()
-            {
-                var $el = $(this),
-                    div = document.createElement('DIV'),
-                    siteKey = config.reCaptchaSiteKey || $el.valAttr('recaptcha-sitekey'),
-                    theme = config.reCaptchaTheme || $el.valAttr('recaptcha-theme') || 'light';
-
-                if( !siteKey ){
-                    throw new Error('Google reCaptcha site key is required.');
-                }
-
-                $el.hide();
-                $el.parent().append(div);
+        var widgetId = grecaptcha.render(div, {
+          sitekey: siteKey,
+          theme: theme
+        });
 
-                var widgetId = grecaptcha.render(div, {
-                    sitekey: siteKey,
-                    theme: theme
-                });
+        $input
+          .valAttr('recaptcha-widget-id', widgetId)
+          .hide()
+          .on('beforeValidation', function(evt) {
+            // prevent validator from skipping this input becaus its hidden
+            evt.stopImmediatePropagation();
+          })
+          .parent()
+          .append(div);
 
-                $el
-                    .valAttr('recaptcha-widgetId', widgetId);
-            });
+      });
 
-        });
-    };
+    });
+  };
 
-    $(window).on('validatorsLoaded formValidationSetup', setupGooglereCaptcha);
+  $(window).on('validatorsLoaded formValidationSetup', setupGooglereCaptcha);
 
 })(jQuery, window);