Fixed lazy load

Update readme
hryvinskyi · Sep 17, 2019 · a89d57c · a89d57c
1 parent 8fe6ff4
commit a89d57c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,11 @@ bin/magento module:enable Hryvinskyi_Base
 bin/magento module:enable Hryvinskyi_InvisibleCaptcha
 bin/magento setup:upgrade
 ````
+
+### Features
+1. Lazy Load, google page speed improvements
+2. Easy to add captcha to your custom form
+
 ### Install download package
 1. Download module https://github.com/hryvinskyi/magento2-base [Link](https://github.com/hryvinskyi/magento2-base/archive/v1.1.2.zip)
 2. Download this module [Link](https://github.com/hryvinskyi/magento2-invisible-captcha/archive/2.0.4.zip)

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         "scriptua/magento2-base": "2.0.*"
     },
     "type": "magento2-module",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "license": "GPL-3.0-or-later",
     "autoload": {
         "files": [ "registration.php" ],

diff --git a/view/base/web/js/invisible-captcha.js b/view/base/web/js/invisible-captcha.js
@@ -11,7 +11,9 @@ define([
     './model/invisible-captcha'
 ], function ($, ko, Component, invisibleCaptcha) {
     'use strict';
-
+    const sleep = (milliseconds) => {
+        return new Promise(resolve => setTimeout(resolve, milliseconds))
+    };
     return Component.extend({
         defaults: {
             template: 'Hryvinskyi_InvisibleCaptcha/invisible-captcha',
@@ -74,21 +76,21 @@ define([
          */
         _initializeTokenField: function (element, self) {
             if (invisibleCaptcha.initializedForms.indexOf(self.captchaId) === -1) {
-                invisibleCaptcha.initializedForms.push(self.captchaId);
-
                 var tokenField = $('<input type="hidden" name="hryvinskyi_invisible_token" />'),
                     siteKey = self.siteKey,
                     action = self.action;
 
+                tokenField.attr('data-action', action);
+                $(element).append(tokenField);
+
                 grecaptcha.ready(function () {
                     grecaptcha
                         .execute(siteKey, {action: action})
                         .then(function (token) {
                             tokenField.val(token);
+                            invisibleCaptcha.initializedForms.push(self.captchaId);
                         });
                 });
-                tokenField.attr('data-action', action);
-                $(element).append(tokenField);
             }
         },
 
@@ -103,7 +105,7 @@ define([
                 let form = $(element).closest('form'),
                     needSubmit = false;
 
-                form.find(':input').on('focus blur change', $.proxy(self._loadRecaptchaScript, self));
+                form.on('focus blur change', ':input', $.proxy(self._loadRecaptchaScript, self));
 
                 // Disable submit form
                 form.on('submit', function (e) {
@@ -114,8 +116,8 @@ define([
                 });
 
                 // Submit form after recaptcha loaded
-                invisibleCaptcha.isApiLoaded.subscribe(function (newValue) {
-                    if (needSubmit === true && newValue === true) {
+                invisibleCaptcha.initializedForms.subscribe(function (newValue) {
+                    if (needSubmit === true && newValue.indexOf(self.captchaId) !== -1) {
                         form.submit();
                     }
                 });