Skip to content
This repository has been archived by the owner on Jan 12, 2022. It is now read-only.

Commit

Permalink
w3 validation fix
Browse files Browse the repository at this point in the history
  • Loading branch information
himiklab committed Jul 3, 2018
1 parent 6fdb334 commit cc8a023
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions ReCaptcha.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,23 @@ public function run()
if (reCaptcha.data("recaptcha-client-id") === undefined) {
var recaptchaClientId = grecaptcha.render(reCaptcha.attr("id"), {
"callback": function(response) {
if (reCaptcha.attr("form-id") !== "") {
jQuery("#" + reCaptcha.attr("input-id"), "#" + reCaptcha.attr("form-id")).val(response).trigger("change");
if (reCaptcha.data("form-id") !== "") {
jQuery("#" + reCaptcha.data("input-id"), "#" + reCaptcha.data("form-id")).val(response)
.trigger("change");
} else {
jQuery("#" + reCaptcha.attr("input-id")).val(response).trigger("change");
jQuery("#" + reCaptcha.data("input-id")).val(response)
.trigger("change");
}
if (reCaptcha.attr("data-callback")) {
eval("(" + reCaptcha.attr("data-callback") + ")(response)");
}
},
"expired-callback": function() {
if (reCaptcha.attr("form-id") !== "") {
jQuery("#" + reCaptcha.attr("input-id"), "#" + reCaptcha.attr("form-id")).val("");
if (reCaptcha.data("form-id") !== "") {
jQuery("#" + reCaptcha.data("input-id"), "#" + reCaptcha.data("form-id")).val("");
} else {
jQuery("#" + reCaptcha.attr("input-id")).val("");
jQuery("#" + reCaptcha.data("input-id")).val("");
}
if (reCaptcha.attr("data-expired-callback")) {
Expand Down Expand Up @@ -242,20 +244,20 @@ protected function buildDivOptions()
if (isset($this->widgetOptions['class'])) {
$divOptions['class'] = "{$divOptions['class']} {$this->widgetOptions['class']}";
}
$divOptions['input-id'] = $this->getReCaptchaId();
$divOptions['data-input-id'] = $this->getReCaptchaId();

if ($this->field !== null && $this->field->form !== null) {
if (!empty($this->field->form->options['id'])) {
$divOptions['form-id'] = $this->field->form->options['id'];
$divOptions['data-form-id'] = $this->field->form->options['id'];
} else {
$divOptions['form-id'] = $this->field->form->id;
$divOptions['data-form-id'] = $this->field->form->id;
}
} else {
$divOptions['form-id'] = '';
$divOptions['data-form-id'] = '';
}

$divOptions['id'] = $this->getReCaptchaId() . '-recaptcha' .
($divOptions['form-id'] ? ('-' . $divOptions['form-id']) : '');
($divOptions['data-form-id'] ? ('-' . $divOptions['data-form-id']) : '');

return $divOptions;
}
Expand Down

0 comments on commit cc8a023

Please sign in to comment.