Refactor last pr

Author: ihorvansach

Block/Adminhtml/System/Config/Form/Js.php

@@ -33,7 +33,7 @@ class Method implements \Magento\Framework\Option\ArrayInterface
     public function toOptionArray(): array
     {
         return  [
-            ['value' => self::JAVASCRIPT, 'label' => __('Non-jQuery JavaScript Library (Require Advanced Configuration)')],
+            ['value' => self::JAVASCRIPT, 'label' => __('Non-jQuery JavaScript Library (Requires Advanced Configuration)')],
             ['value' => self::NATIVE, 'label' => __('Native Browser Lazy Loading')],
         ];
     }

Model/Config/Source/Method.php

@@ -245,7 +245,7 @@ protected function isEnabled($block, string $html): bool
      * @param $block
      * @return bool
      */
-    private function isBlockSkiped($block): bool
+    private function isBlockSkipped($block): bool
     {
         return in_array(get_class($block), $this->skipBlocks);
     }

Plugin/BlockPlugin.php

@@ -31,7 +31,6 @@
                 <field id="method" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="27" translate="label comment" type="select"  canRestore="1">
                     <label>Method</label>
                     <source_model>Magefan\LazyLoad\Model\Config\Source\Method</source_model>
-                    <frontend_model>Magefan\LazyLoad\Block\Adminhtml\System\Config\Form\Js</frontend_model>
                 </field>
 
                 <field id="blocks_to_lazy_load" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="28" translate="label comment" type="select"  canRestore="1">
@@ -40,10 +39,10 @@
 
                     <comment><![CDATA[
                            <strong>If the "All" option is chosen:</strong><br/>
-                           Lazy Load will be added to all blocks. In the "Lazy Load Blocks" section you can skip n images for some blocks to make them visible immediately.
+                           Lazy Load will be added to all blocks. In the "Lazy Load Blocks" section you can skip a few images for some blocks to make them visible immediately.
                            <br/>
                            <strong>If the "Selected" option is chosen:</strong><br/>
-                           You need to specify the blocks in which images should be lazy-loaded. Here you can also skip the first n images.
+                           You need to specify the blocks in which images should be lazy-loaded. Here you can also skip the first few images.
                         ]]></comment>
                 </field>
 
@@ -65,7 +64,7 @@
                     <depends>
                         <field id="method">0</field>
                     </depends>
-                    <tooltip>The noscript HTML element defines a section of HTML that is inserted if a script type on the page is unsupported or if scripting is currently turned off in the browser. This option enables the display of images even when JavaScript is disabled in the browser and lazy load js script cannot be loaded. Note that when enabled it adds extra HTML tags to the page.</tooltip>
+                    <comment>The noscript HTML element defines a section of HTML that is inserted if a script type on the page is unsupported or if scripting is currently turned off in the browser. This option enables the display of images even when JavaScript is disabled in the browser and lazy load js script cannot be loaded. Note that when enabled it adds extra HTML tags to the page.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>

Setup/Patch/Data/SaveDefaultLazyLoadMethod.php

@@ -13,8 +13,8 @@
             <general>
                 <mfmodule>LazyLoad</mfmodule>
                 <mftype>1</mftype>
-                <method>1</method>
-                <blocks_to_lazy_load>0</blocks_to_lazy_load>
+                <method>0</method>
+                <blocks_to_lazy_load>1</blocks_to_lazy_load>
                 <lazy_blocks>
                     {
                         "_1686830676971_971":{"block_identifier":"footer","first_images_to_skip":"0"},

etc/adminhtml/system.xml

@@ -21,28 +21,28 @@
 <?php } ?>
 <?php if ($block->getIsJavascriptLazyLoadMethod()) { ?>
 <script data-rocketjavascript="false">
-    var utilLoad = setInterval(function() {
-        if (window.scrollY > 100 || isPixelImageInAViewPort(document.querySelector('main img[src$="pixel.jpg"]'))) {
+    window.mfLazyUtilLoad = setInterval(function() {
+        if (window.scrollY > 100 || isMfLazyPixelImageInAViewPort(document.querySelector('main img[src$="pixel.jpg"]'))) {
             loadLazyLoad();
         }
     }, 10);
 
     document.addEventListener("DOMContentLoaded", function () {
-        if (isPixelImageInAViewPort(document.querySelector('main img[src$="pixel.jpg"]'))) {
+        if (isMfLazyPixelImageInAViewPort(document.querySelector('main img[src$="pixel.jpg"]'))) {
             loadLazyLoad();
         } else {
             document.addEventListener('scroll', loadLazyLoad, { once: true });
             document.addEventListener('click', loadLazyLoad, { once: true });
         }
     });
 
-    function isPixelImageInAViewPort(element, offset = 100)
+    function isMfLazyPixelImageInAViewPort(element, offset = 100)
     {
         return element && ((element.getBoundingClientRect().top - offset) < window.innerHeight);
     }
 
     function loadLazyLoad() {
-        clearInterval(utilLoad);
+        clearInterval(window.mfLazyUtilLoad);
         <?php if ($block->isNoScriptEnabled()) { ?>
             document.body.className = document.body.className.replace('mflazyzoad-no-js', '');
         <?php } ?>