Merge pull request #3 from onfire/class-fix

update js to allow extending base class, as well as allowing $validator to be passed to parent
CMeldgaard · May 6, 2019 · 4f87b43 · 4f87b43
2 parents 0279ae7 + 348c4cd
commit 4f87b43
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/js/recaptcha.js b/js/recaptcha.js
@@ -1,5 +1,5 @@
 window.addEventListener("load",function() {
-    document.getElementById('RecaptchaForm_'+'$formName').addEventListener('submit', function (event) {
+    document.getElementById('$formName').addEventListener('submit', function (event) {
         event.preventDefault();    //stop form from submitting
         var submittedForm = event.target;
         // needs for recaptacha ready

diff --git a/src/Form/RecaptchaField.php b/src/Form/RecaptchaField.php
@@ -63,7 +63,7 @@ public function Field($properties = array())
             "siteKey" => $this->getSiteKey(),
             "customFunction" => $this->customFunction,
             "customNameFunction" => $this->customFunctionName,
-            "formName" => $this->getForm()->name
+            "formName" => $this->getForm()->FormName()
         ];
 
         $recaptchaJs = 'https://www.google.com/recaptcha/api.js?render='.$this->getSiteKey();

diff --git a/src/Form/RecaptchaForm.php b/src/Form/RecaptchaForm.php
@@ -17,7 +17,8 @@ public function __construct(RequestHandler $controller = null,$name,FieldList $f
             $controller,
             $name,
             $formFields,
-            $formActions
+            $formActions,
+            $validator
         );
     }
 }