Code improvements

Author: andriysvyryda

Block/Lazy.php

@@ -32,6 +32,17 @@ protected function _toHtml()
         return '';
     }
 
+    /**
+     * @return bool
+     */
+    public function isNoScriptEnabled()
+    {
+        return (bool)$this->_scopeConfig->getValue(
+            \Magefan\LazyLoad\Model\Config::XML_PATH_LAZY_NOSCRIPT,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
     /**
      * Retrieve lazy load config json string
      *

Observer/LayoutLoadBeforeObserver.php

@@ -40,11 +40,9 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        if ($this->config->getEnabled()) {
+        if ($this->config->getEnabled() && $this->config->isNoScriptEnabled()) {
             $layout = $observer->getLayout();
-            if ($this->config->isNoScriptEnabled()) {
-                $layout->getUpdate()->addHandle('mflazyzoad_no_js');
-            }
+            $layout->getUpdate()->addHandle('mflazyzoad_no_js');
         }
     }
 }

etc/adminhtml/system.xml

@@ -40,7 +40,7 @@
                 </field>
                 <field id="noscript" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label comment" type="select">
                     <label>Include Noscript HTML Tag</label>
-                    <comment>The noscript HTML element defines a section of HTML to be inserted if a script type on the page is unsupported or if scripting is currently turned off in the browser. This option enables to 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>
+                    <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>

view/frontend/templates/lazy.phtml

@@ -6,11 +6,7 @@
  * Glory to Ukraine! Glory to the heroes!
  */
 ?>
-<?php
-$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-$config = $objectManager->get(\Magefan\LazyLoad\Model\Config::class);
-?>
-<?php if ($config->isNoScriptEnabled()) { ?>
+<?php if ($block->isNoScriptEnabled()) { ?>
     <style>
         .mflazyzoad-no-js [data-original],
         .mflazyzoad-no-js [data-originalset] {
@@ -20,7 +16,7 @@ $config = $objectManager->get(\Magefan\LazyLoad\Model\Config::class);
 <?php } ?>
 <script data-rocketjavascript="false">
     (function(){
-        <?php if ($config->isNoScriptEnabled()) { ?>
+        <?php if ($block->isNoScriptEnabled()) { ?>
             document.body.className = document.body.className.replace('mflazyzoad-no-js', '');
         <?php } ?>
         var jsSrc = '<?php echo $this->getViewFileUrl('Magefan_LazyLoad::js/lazyload.min.js'); ?>';