From 46e0f509f85d9e97d3e0c5907c02e2739c522dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Fri, 16 Jun 2017 11:42:37 +0800
Subject: [PATCH] =?UTF-8?q?css=E5=BB=B6=E8=BF=9F=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../htmlcompressor/controllers/index.php      | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/application/third_party/htmlcompressor/controllers/index.php b/application/third_party/htmlcompressor/controllers/index.php
index b2f32dca..ca1f0e17 100644
--- a/application/third_party/htmlcompressor/controllers/index.php
+++ b/application/third_party/htmlcompressor/controllers/index.php
@@ -62,14 +62,16 @@ class Index extends CI_Controller {
                     //网页内的js不需要提取
                     //$js_content.= $link_script->innertext;//js的内容
                     // $js_content.= $link_script;//js的内容，包含<script>标签
-                    
-                  //  $link_script_content=$link_script->outertext;
+
+                    $link_script_content = $link_script;
                     //含有$表示调用了jquery的函数，添加延迟加载defer
-                  //  if(strpos( $link_script_content,'$')!==FALSE){
-                  //     $link_script_content= str_replace('defer','defer',$link_script_content);
-                  //     $link_script_content= str_replace('<script','<script defer',$link_script_content);
-                  //  }
-                    $js_content.= $link_script;//js的内容，包含<script>标签
+                    if (strpos($link_script_content, '$') !== FALSE) {
+                        $link_script_content = str_replace('defer', 'defer', $link_script_content);
+                        $link_script_content = str_replace('<script', '<script defer', $link_script_content);
+                        $js_content.= $link_script_content;
+                    } else {
+                        $js_content.= $link_script; //js的内容，包含<script>标签
+                    }
                     $link_script->outertext = ''; //删除js，移动到页底
                 }
             }
@@ -100,12 +102,12 @@ class Index extends CI_Controller {
             //把css移动到页面底部，延迟加载
             $lastload_js = '<noscript id="deferred-styles">';
             foreach ($link_css_array as $item) {
-                $lastload_js.='<link rel="stylesheet" type="text/css" href="'.$item.'"/>';
+                $lastload_js.='<link rel="stylesheet" type="text/css" href="' . $item . '"/>';
             }
             $lastload_js.='</noscript><script>var loadDeferredStyles=function(){var addStylesNode=document.getElementById("deferred-styles");var replacement=document.createElement("div");replacement.innerHTML=addStylesNode.textContent;document.body.appendChild(replacement);addStylesNode.parentElement.removeChild(addStylesNode)};var raf=requestAnimationFrame||mozRequestAnimationFrame||webkitRequestAnimationFrame||msRequestAnimationFrame;if(raf){raf(function(){window.setTimeout(loadDeferredStyles,0)})}else{window.addEventListener("load",loadDeferredStyles)};</script>';
             //把js移动到页面底部
             foreach ($link_js_array as $item) {
-                $lastload_js.='<script  src="' . $item . '"></script>';
+                $lastload_js.='<script defer  src="' . $item . '"></script>';
             }
             $lastload_js.=$js_content;