Improved code logic

Author: shinsenter

src/Helpers/DeferConstant.php

@@ -152,7 +152,7 @@ class DeferConstant
     // -------------------------------------------------------------------------
 
     // Source files
-    const SRC_DEFERJS_CDN      = 'https://cdn.jsdelivr.net/npm/@shinsenter/defer.js@2.3.0/dist/defer_plus.min.js';
+    const SRC_DEFERJS_CDN      = 'https://cdn.jsdelivr.net/npm/@shinsenter/defer.js@2.4.0/dist/defer_plus.min.js';
     const SRC_POLYFILL_CDN     = 'https://polyfill.io/v3/polyfill.min.js?features=IntersectionObserver';
     const SRC_DEFERJS_FALLBACK = DEFER_PHP_ROOT . '/public/lib/defer_plus.min.js';
     const SCR_DEFERJS_CACHE    = DEFER_PHP_ROOT . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR;

src/Helpers/DeferMinifier.php

@@ -48,7 +48,7 @@ public static function minifyCss($input)
         // Minify the css code
         // See: https://gist.github.com/clipperhouse/1201239/cad48570925a4f5ff0579b654e865db97d73bcc4
         $minified = preg_replace('/\s*([,\+\*\/>~;:!}{]{1})\s*/', '$1', $input);
-        $minified = strtr($minified, [';}' => '}', "\r" => '', "\n" => '', '0.' => '.']);
+        $minified = strtr($minified, [';}' => '}', "\r" => '', "\n" => '']);
 
         // Strip comments
         // See: https://gist.github.com/orangexception/1292778

src/Helpers/DeferOptimizer.php

@@ -238,8 +238,6 @@ public static function optimizeElement(ElementNode &$node, DeferOptions &$option
             $lazied = $resolver->lazyload();
 
             if ($lazied) {
-                $node->addClass(DeferConstant::CLASS_DEFER_LOADING);
-
                 if (!empty($fallback)) {
                     $fallback->detach();
                     $node->follow($fallback);

src/Helpers/DeferOptions.php

@@ -241,7 +241,7 @@ public function getWellKnown3rd($useCache = true)
      *  'manually_add_deferjs' => false,
      *
      *  // URL to defer.js javascript file.
-     *  // Default: https://cdn.jsdelivr.net/npm/@shinsenter/defer.js@2.3.0/dist/defer_plus.min.js
+     *  // Default: https://cdn.jsdelivr.net/npm/@shinsenter/defer.js@2.4.0/dist/defer_plus.min.js
      *  'deferjs_src'  => \AppSeeds\DeferConstant::SRC_DEFERJS_CDN,
      *
      *  // URL to javascript contains fixes.

src/Resolvers/DeferResolver.php

@@ -359,6 +359,7 @@ public function createDataAttr($attr, $placeholder = '')
         if ($placeholder != $value) {
             $this->node->setAttribute($attr, $placeholder);
             $this->node->setAttribute($data_attr, $value);
+            $this->node->addClass(DeferConstant::CLASS_DEFER_LOADING);
         }
 
         return $this;

src/Resolvers/IframeResolver.php

@@ -48,7 +48,7 @@ public function normalize()
         }
 
         if (empty($this->node->getAttribute('title'))) {
-            $this->node->setAttribute('title', basename($src ?: ''));
+            $this->node->setAttribute('title', basename($src ?: 'blank'));
         }
 
         // Browser-level image lazy-loading for the web

src/Resolvers/StyleResolver.php

@@ -119,10 +119,7 @@ public function lazyload()
         // Only defer when it is a CSS node
         // and "onload" attribute is not provided
         $media = $this->node->getAttribute('media');
-
-        if (!empty($media)) {
-            $this->node->setAttribute('data-media', $media);
-        }
+        $this->node->setAttribute('data-media', $media ?: 'all');
 
         // Lazyload the style
         $this->node->setAttribute('media', DeferConstant::TEMPLATE_LAZY_MEDIA_ATTR);

tests/v2/test.php

@@ -28,10 +28,9 @@
 require_once BASE . DS . 'helpers.php';
 
 // Test request arguments
-$_REQUEST['nodefer']            = 0;
-$_REQUEST['debug']              = 0;
-$_REQUEST['debug_time']         = 1;
-$_REQUEST['minify_output_html'] = 1;
+$_REQUEST['nodefer']    = 0;
+$_REQUEST['debug']      = 0;
+$_REQUEST['debug_time'] = 1;
 
 // New instance
 $defer = new AppSeeds\Defer([
@@ -79,6 +78,7 @@
         '.header_top_icon_list img',
         '.header_logo img',
         '.banner img',
+        '.logo',
     ],
 ]);