support same model forms on one page (issue #61)

himiklab · Feb 9, 2018 · 7f40838 · 7f40838
1 parent 9fb048a
commit 7f40838
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/ReCaptcha.php b/ReCaptcha.php
@@ -119,13 +119,23 @@ public function run()
         if (reCaptcha.data("recaptcha-client-id") === undefined) {
             var recaptchaClientId = grecaptcha.render(reCaptcha.attr("id"), {
                 "callback": function(response) {
-                    jQuery("#" + reCaptcha.attr("input-id")).val(response).trigger("change");
+                    if (reCaptcha.attr("form-id") !== "") {
+                        jQuery("#" + reCaptcha.attr("input-id"), "#" + reCaptcha.attr("form-id")).val(response).trigger("change");
+                    } else {
+                        jQuery("#" + reCaptcha.attr("input-id")).val(response).trigger("change");
+                    }
+
                     if (reCaptcha.attr("data-callback")) {
                         eval("(" + reCaptcha.attr("data-callback") + ")(response)");
                     }
                 },
                 "expired-callback": function() {
-                    jQuery("#" + reCaptcha.attr("input-id")).val("");
+                    if (reCaptcha.attr("form-id") !== "") {
+                        jQuery("#" + reCaptcha.attr("input-id"), "#" + reCaptcha.attr("form-id")).val("");
+                    } else {
+                        jQuery("#" + reCaptcha.attr("input-id")).val("");
+                    }
+
                     if (reCaptcha.attr("data-expired-callback")) {
                          eval("(" + reCaptcha.attr("data-expired-callback") + ")()");
                     }
@@ -228,7 +238,9 @@ protected function buildDivOptions()
             $divOptions['class'] = "{$divOptions['class']} {$this->widgetOptions['class']}";
         }
         $divOptions['input-id'] = $this->getReCaptchaId();
-        $divOptions['id'] = $this->getReCaptchaId() . '-recaptcha';
+        $divOptions['form-id'] = isset($this->field->form->id) ? $this->field->form->id : '';
+        $divOptions['id'] = $this->getReCaptchaId() . '-recaptcha' .
+            ($divOptions['form-id'] ? ('-' . $divOptions['form-id']) : '');
 
         return $divOptions;
     }