fix bug download css from remoute

skeeks-semenov · Feb 11, 2016 · 00bdd8d · 00bdd8d
1 parent dd949f2
commit 00bdd8d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/AssetsAutoCompressComponent.php b/AssetsAutoCompressComponent.php
@@ -312,7 +312,7 @@ protected function _processingJsFiles($files = [])
         {
             if (Url::isRelative($fileCode))
             {
-                $resultContent[] = trim($this->fileGetContents( Url::to(\Yii::getAlias('@web' . $fileCode), true) ));
+                $resultContent[] = trim($this->fileGetContents( Url::to(\Yii::getAlias('@web' . $fileCode), true) )) . "\n;";;
             } else
             {
                 if ($this->jsFileRemouteCompile)
@@ -378,16 +378,17 @@ protected function _processingCssFiles($files = [])
 
             foreach ($files as $fileCode => $fileTag)
             {
-                if (!Url::isRelative($fileCode))
+                if (Url::isRelative($fileCode))
                 {
-                    $resultFiles[$fileCode] = $fileTag;
+
                 } else
                 {
-                    if ($this->cssFileRemouteCompile)
+                    if (!$this->cssFileRemouteCompile)
                     {
                         $resultFiles[$fileCode] = $fileTag;
                     }
                 }
+
             }
 
             $publicUrl                  = $publicUrl . "?v=" . filemtime($rootUrl);

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 ==============
 
+1.1.1.pre
+-----------------
+  * fix bug download css from remoute
+
 1.1
 -----------------
   * Removed unnecessary settings preloader