Merge pull request #63 from shinsenter/develop

Bug fixes
shinsenter · Apr 16, 2021 · b097d36 · b097d36
2 parents 0eb9830 + 3b133ad
commit b097d36
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 🚀 A PHP library that aims to help you concentrate on web performance optimization.
 
 - **Package**: [@shinsenter/defer.php](https://packagist.org/packages/shinsenter/defer.php)
-- **Version**: 2.2.0
+- **Version**: 2.4.0
 - **Author**: Mai Nhut Tan <shin@shin.company>
 - **Copyright**: 2021 AppSeeds <https://code.shin.company/>
 - **License**: [MIT](https://raw.githubusercontent.com/shinsenter/defer.php/master/LICENSE)
@@ -383,7 +383,9 @@ Only few options of this library are applicable to AMP pages (minifying HTML con
 
 ### Laravel package
 
-Under development.
+[https://github.com/shinsenter/defer-laravel/](https://github.com/shinsenter/defer-laravel/)
+
+🚀 A Laravel package that focuses on minimizing payload size of HTML document and optimizing processing on the browser when rendering the web page.
 
 
 ## Support my activities

diff --git a/src/Resolvers/DeferResolver.php b/src/Resolvers/DeferResolver.php
@@ -229,7 +229,7 @@ public function skipLazyloading($attr = 'src')
 
             if (!empty($value)) {
                 foreach ($blacklist as $keyword) {
-                    if (strstr($value, $keyword) !== true) {
+                    if (strstr($value, $keyword) !== false) {
                         return true;
                     }
                 }
@@ -243,7 +243,7 @@ public function skipLazyloading($attr = 'src')
 
             if (!empty($text)) {
                 foreach ($blacklist as $keyword) {
-                    if (strstr($text, $keyword) !== true) {
+                    if (strstr($text, $keyword) !== false) {
                         return true;
                     }
                 }

diff --git a/src/Resolvers/LinkResolver.php b/src/Resolvers/LinkResolver.php
@@ -287,7 +287,9 @@ public function lazyload()
     {
         // Only defer when it is a CSS node
         // and "onload" attribute is not provided
-        if (!$this->isCss() || $this->node->hasAttribute('onload')) {
+        if (!$this->isCss() ||
+            $this->node->hasAttribute('onload') ||
+            $this->skipLazyloading('href')) {
             return false;
         }
 

diff --git a/src/Resolvers/ScriptResolver.php b/src/Resolvers/ScriptResolver.php
@@ -195,7 +195,9 @@ public function shouldLazyload()
      */
     public function lazyload()
     {
-        if ($this->isDeferJs() || $this->isCriticalJavascript()) {
+        if ($this->isDeferJs() ||
+            $this->isCriticalJavascript() ||
+            $this->skipLazyloading('src')) {
             return false;
         }
 

diff --git a/tests/v2/test.php b/tests/v2/test.php
@@ -68,9 +68,12 @@
     'iframe_placeholder' => 'about:blank',
 
     // Splash screen
-    'custom_splash_screen' => '',
+    'custom_splash_screen' => '<div id="loading"></div>',
 
     // Blacklists
+    'ignore_lazyload_paths' => [
+        'jquery',
+    ],
     'ignore_lazyload_css_class' => [
         'zoom-lens',
     ],