Add script at the end of body instead of head

Problem is that especially in firefox the script is loaded before the dom content is loaded See FriendlyCaptcha/friendly-challenge#20
iMi-digital · Apr 28, 2021 · 4660d76 · 4660d76
1 parent 2bff025
commit 4660d76
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/view/frontend/layout/contact_index_index.xml b/view/frontend/layout/contact_index_index.xml
@@ -6,14 +6,14 @@
 
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <script src="IMI_FriendlyCaptcha::js/vendor/friendly-challenge/widget.module.js" type="module" async="true" />
-    </head>
     <body>
         <referenceContainer name="form.additional.info">
             <block class="IMI\FriendlyCaptcha\Block\Frontend\FriendlyCaptcha" name="imi_friendly_captcha_widget" after="-"
                    template="IMI_FriendlyCaptcha::imi_friendly_captcha.phtml"
                    ifconfig="imi_friendly_captcha/frontend/enabled"/>
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Magento\Framework\View\Element\Template" template="IMI_FriendlyCaptcha::imi_friendly_captcha_js.phtml" name="friendly_captcha_js" ifconfig="imi_friendly_captcha/frontend/enabled"/>
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/customer_account_create.xml b/view/frontend/layout/customer_account_create.xml
@@ -6,14 +6,14 @@
 
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <script src="IMI_FriendlyCaptcha::js/vendor/friendly-challenge/widget.module.js" type="module" async="true" />
-    </head>
     <body>
         <referenceContainer name="form.additional.info">
             <block class="IMI\FriendlyCaptcha\Block\Frontend\FriendlyCaptcha" name="imi_friendly_captcha_widget" after="-"
                    template="IMI_FriendlyCaptcha::imi_friendly_captcha.phtml"
                    ifconfig="imi_friendly_captcha/frontend/enabled_create" />
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Magento\Framework\View\Element\Template" template="IMI_FriendlyCaptcha::imi_friendly_captcha_js.phtml" name="friendly_captcha_js" ifconfig="imi_friendly_captcha/frontend/enabled"/>
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/customer_account_forgotpassword.xml b/view/frontend/layout/customer_account_forgotpassword.xml
@@ -6,14 +6,14 @@
 
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <script src="IMI_FriendlyCaptcha::js/vendor/friendly-challenge/widget.module.js" type="module" async="true" />
-    </head>
     <body>
         <referenceContainer name="form.additional.info">
             <block class="IMI\FriendlyCaptcha\Block\Frontend\FriendlyCaptcha" name="imi_friendly_captcha_widget" after="-"
                    template="IMI_FriendlyCaptcha::imi_friendly_captcha.phtml"
                    ifconfig="imi_friendly_captcha/frontend/enabled_forgot" />
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Magento\Framework\View\Element\Template" template="IMI_FriendlyCaptcha::imi_friendly_captcha_js.phtml" name="friendly_captcha_js" ifconfig="imi_friendly_captcha/frontend/enabled"/>
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/customer_account_login.xml b/view/frontend/layout/customer_account_login.xml
@@ -6,14 +6,14 @@
 
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <script src="IMI_FriendlyCaptcha::js/vendor/friendly-challenge/widget.module.js" type="module" async="true" />
-    </head>
     <body>
         <referenceContainer name="form.additional.info">
             <block class="IMI\FriendlyCaptcha\Block\Frontend\FriendlyCaptcha" name="imi_friendly_captcha_widget" after="-"
                    template="IMI_FriendlyCaptcha::imi_friendly_captcha.phtml"
                    ifconfig="imi_friendly_captcha/frontend/enabled_login" />
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Magento\Framework\View\Element\Template" template="IMI_FriendlyCaptcha::imi_friendly_captcha_js.phtml" name="friendly_captcha_js" ifconfig="imi_friendly_captcha/frontend/enabled"/>
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/sendfriend_product_send.xml b/view/frontend/layout/sendfriend_product_send.xml
@@ -6,14 +6,14 @@
 
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <script src="IMI_FriendlyCaptcha::js/vendor/friendly-challenge/widget.module.js" type="module" async="true" />
-    </head>
     <body>
         <referenceContainer name="form.additional.info">
             <block class="IMI\FriendlyCaptcha\Block\Frontend\FriendlyCaptcha" name="imi_friendly_captcha_widget" after="-"
                    template="IMI_FriendlyCaptcha::imi_friendly_captcha.phtml"
                    ifconfig="imi_friendly_captcha/frontend/enabled_sendfriend" />
         </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Magento\Framework\View\Element\Template" template="IMI_FriendlyCaptcha::imi_friendly_captcha_js.phtml" name="friendly_captcha_js" ifconfig="imi_friendly_captcha/frontend/enabled"/>
+        </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/templates/imi_friendly_captcha_js.phtml b/view/frontend/templates/imi_friendly_captcha_js.phtml
@@ -0,0 +1,8 @@
+<?php
+/**
+ *  Copyright © iMi digital GmbH, based on work by MageSpecialist
+ *  See LICENSE for license details.
+ */
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<script src="<?= $block->getViewFileUrl('IMI_FriendlyCaptcha::js/vendor/friendly-challenge/widget.module.js')?>" type="module" async></script>