Исключения для удаления скриптов и стилей. При исключении работают др…

…угие правила.
Joomline · Apr 20, 2017 · b59ab3e · b59ab3e
1 parent add052f
commit b59ab3e
Showing 1 changed file with 15 additions and 20 deletions.
diff --git a/jscssmanipulate.php b/jscssmanipulate.php
@@ -27,7 +27,7 @@ function onBeforeCompileHead()
     {
         $app = JFactory::getApplication();
         if ($app->isAdmin()) {
-            return;
+            return true;
         }
 
         $doc = JFactory::getDocument();
@@ -55,14 +55,9 @@ function onBeforeCompileHead()
 
                     $debug && $debugInfo .= '<li>' . $searchUrl . ' ==> ';
 
-                    if (!empty($params->remove)) {
-                        if($this->checkExceptions($params->remove_exceptions)){
-                            $debug && $debugInfo .= '<span class="label label-primary">EXCEPTIONS</span>';
-                        }
-                        else{
-                            $debug && $debugInfo .= '<span class="label label-danger">REMOVED</span>';
-                            unset($doc->_scripts[$searchUrl]);
-                        }
+                    if (!empty($params->remove) && !$this->checkExceptions($params->remove_exceptions, $debug, $debugInfo)) {
+                        $debug && $debugInfo .= '<span class="label label-danger">REMOVED</span>';
+                        unset($doc->_scripts[$searchUrl]);
                     } else {
                         if (!empty($params->defer)) {
                             $debug && $debugInfo .= '<span class="label label-success">DEFER</span>';
@@ -99,14 +94,9 @@ function onBeforeCompileHead()
 
                     $debug && $debugInfo .= '<li>' . $searchUrl . ' ==> ';
 
-                    if (!empty($params->remove)) {
-                        if($this->checkExceptions($params->remove_exceptions)){
-                            $debug && $debugInfo .= '<span class="label label-primary">EXCEPTIONS</span>';
-                        }
-                        else{
-                            $debug && $debugInfo .= '<span class="label label-danger">REMOVED</span>';
-                            unset($doc->_styleSheets[$searchUrl]);
-                        }
+                    if (!empty($params->remove) && !$this->checkExceptions($params->remove_exceptions, $debug, $debugInfo)) {
+                        $debug && $debugInfo .= '<span class="label label-danger">REMOVED</span>';
+                        unset($doc->_styleSheets[$searchUrl]);
                     } else if (!empty($params->foother)) {
                         $debug && $debugInfo .= '<span class="label label-danger">MOVED TO FOOTHER</span>';
                         $this->footherCss[$searchUrl] = $doc->_styleSheets[$searchUrl];
@@ -222,8 +212,7 @@ private function prepareConfig()
         return $config;
     }
 
-    private function checkExceptions($removeExceptions){
-        $return = false;
+    private function checkExceptions($removeExceptions, $debug, &$debugInfo){
         $removeExceptions = trim($removeExceptions);
         if(empty($removeExceptions)){
             return false;
@@ -244,6 +233,12 @@ private function checkExceptions($removeExceptions){
             $aCheck[] = (int)in_array($input->getString($removeException[0], ''), $values);
         }
 
-        return !in_array(0, $aCheck);
+        $exception = !in_array(0, $aCheck);
+
+        if($exception){
+            $debug && $debugInfo .= '<span class="label label-primary">EXCEPTION</span>';
+        }
+
+        return $exception;
     }
 }