Skip to content

Re: Issue #512, Multiple forms with captcha #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
victorjonsson merged 4 commits into from
Oct 17, 2016
Merged

Re: Issue #512, Multiple forms with captcha #513

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62eaaa1
Merge pull request #5 from victorjonsson/master
FuzzyBS Oct 17, 2016
7ced80d
Issue #512, Multiple captchas not working
FuzzyBS Oct 17, 2016
cb8ee60
Issue #512, Multiple captchas attempted fix
FuzzyBS Oct 17, 2016
cd13092
jshint errors
FuzzyBS Oct 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Issue #512, Multiple captchas attempted fix 
In addition to previous commit, I realized that the Google validation
callback needed to identify which form so it wouldn't mark both forms,
so I created an array of callback functions each with a reference to a
form ID (which is created if not already present). Fingers crossed this
won't blow anything up!
For @jeesus to test with.
  • Loading branch information
@FuzzyBS
FuzzyBS committed Oct 17, 2016
commit cb8ee6050e3f608269f21cb5580fc6daa0279fed
17 changes: 12 additions & 5 deletions src/modules/security.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,12 @@
$forms = $('form');
}

var i=0,
grecaptchaRenderCallback = [];
$forms.each(function () {
var $form = $(this),
config = $form.context.validationConfig || false;
if (config) {
if (config) {

$('[data-validation~="recaptcha"]', $form).each(function () {
var $input = $(this),
Expand All @@ -570,21 +572,26 @@
throw new Error('Google reCaptcha site key is required.');
}

var grecaptchaRenderCallback = function (result) {
$('form').each(function () {
if (!$form.attr('id')) {
$form.attr('id', 'recaptcha-form-' + (i++));
};
grecaptchaRenderCallback[$form.attr('id')] = function (result) {
var formID;
$('#' + formID).each(function () {
$('[data-validation~="recaptcha"]', $(this)).each(function () {
$(this).trigger('validation', (result && result !== ''));
});
});
};
grecaptchaRenderCallback[$form.attr('id')].formID = $form.attr('id');

var widgetId = grecaptcha.render(div, {
sitekey: siteKey,
theme: theme,
size: size,
type: type,
callback: grecaptchaRenderCallback,
'expired-callback': grecaptchaRenderCallback
callback: grecaptchaRenderCallback[$form.attr('id')],
'expired-callback': grecaptchaRenderCallback[$form.attr('id')]
});

$input
Expand Down