Merge pull request #39 from shinsenter/develop

Fixed #30

Author: shinsenter

README.md

@@ -120,9 +120,6 @@ $defer->empty_src               = '';
 $defer->use_color_placeholder   = true;
 $defer->use_css_fadein_effects  = true;
 
-// Manually add deferjs library script tag
-// $defer->manually_add_deferjs   = true;
-
 // Blacklist
 $defer->do_not_optimize = [
     'document\.write\s*\(',
@@ -136,6 +133,25 @@ var_dump($result);
 
 
 
+### Manually add defer.js library script tag
+
+In some regions, you may want to serve defer.js library locally due to [The General Data Protection Regulation (EU)](https://en.wikipedia.org/wiki/General_Data_Protection_Regulation).
+
+```php
+// Include the library
+require_once __DIR__ . '/vendor/shinsenter/defer.php/defer.php';
+
+// Create a Defer object
+$defer = new \shinsenter\Defer();
+$defer->manually_add_deferjs = true;
+
+// Then get the optimized output
+$result = $defer->fromHtml(file_get_contents('mypage.html'))->toHtml();
+var_dump($result);
+```
+
+
+
 ## [defer-wordpress](https://github.com/shinsenter/defer-wordpress/releases)
 
 WordPress remains one of the most popular CMS platform until now. This is a WordPress plugin. Hope you guys like it.
@@ -144,6 +160,8 @@ WordPress remains one of the most popular CMS platform until now. This is a Word
 
 ## Keep in touch
 
+[![Donate via Paypal](https://pics.paypal.com/00/s/NTQ4M2ZiN2YtZDg1My00ZmRiLWJiMDQtMTFlMjg2ODY2N2Uy/file.PNG)](https://www.paypal.me/shinsenter)
+
 [![Become a sponsor](https://c5.patreon.com/external/logo/[email protected])](https://www.patreon.com/appseeds)
 
 

src/DeferOptimizer.php

@@ -68,10 +68,12 @@ protected function optimize()
      */
     protected function initLoaderJs()
     {
-        $cleanup = '//script[@id="defer-js" or @id="defer-script" or @id="polyfill-js"]|//style[@id="defer-css"]';
+        if (!$this->manually_add_deferjs) {
+            $cleanup = '//script[@id="defer-js" or @id="defer-script" or @id="polyfill-js"]|//style[@id="defer-css"]';
 
-        foreach ($this->xpath->query($cleanup) as $node) {
-            $this->removeNode($node);
+            foreach ($this->xpath->query($cleanup) as $node) {
+                $this->removeNode($node);
+            }
         }
 
         $cache  = $this->cache_manager;
@@ -140,19 +142,19 @@ protected function addDeferJs()
                     static::ATTR_ID  => 'defer-js',
                 ]);
 
-                $this->head->insertBefore($script_tag, $the_anchor);
+                $this->head->appendChild($script_tag);
                 $script_tag = null;
             }
 
             $extra_scripts[] = static::$deferjs_script;
             $extra_scripts[] = '"IntersectionObserver"in window||deferscript("' . static::POLYFILL_URL . '","polyfill-js",1)';
         } else {
             $message = implode('\n', [
-                'You should manually add the defer.js.\n\nFor example:',
-                '<script id="defer-js" src="' . static::DEFERJS_URL . '"><\/script>',
-                '<script id="polyfill-js" src="' . static::POLYFILL_URL . '"><\/script>',
+                'You should manually add the defer.js.\n\nLike this:',
+                '<script data-ignore id="defer-js" src="' . static::DEFERJS_URL . '"><\/script>',
+                '<script data-ignore id="polyfill-js" src="' . static::POLYFILL_URL . '"><\/script>',
             ]);
-            $extra_scripts[] = "window.defer=setTimeout;defer(function(){console.info('${message}')});";
+            $extra_scripts[] = "if(!'defer'in window){window.defer=setTimeout;defer(function(){console.info('${message}')})}";
         }
 
         // Append helpers
@@ -165,7 +167,7 @@ protected function addDeferJs()
         if (!empty($script)) {
             $script_tag = $this->createNode(static::SCRIPT_TAG, trim($script), [static::ATTR_ID => 'defer-script']);
 
-            $this->head->insertBefore($script_tag, $the_anchor);
+            $this->head->appendChild($script_tag);
             $script_tag = null;
         }
 

test/test.php

@@ -55,7 +55,7 @@
 $defer->use_color_placeholder  = false;
 
 // Manually add deferjs library script tag
-// $defer->manually_add_deferjs   = true;
+// $defer->manually_add_deferjs = true;
 
 $defer->clearCache();