From 85f4c67f0843e5f5ad0260097efb385565daf5a2 Mon Sep 17 00:00:00 2001
From: emkael <emkael@tlen.pl>
Date: Fri, 29 Apr 2016 14:03:17 +0200
Subject:  * compileFiles method renamed, as stylesheet compilation is coming

---
 app/php/web/ClientScriptManager.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/php/web/ClientScriptManager.php b/app/php/web/ClientScriptManager.php
index f43ac02..749bbcc 100644
--- a/app/php/web/ClientScriptManager.php
+++ b/app/php/web/ClientScriptManager.php
@@ -117,7 +117,7 @@ class ClientScriptManager extends TClientScriptManager {
         );
     }
 
-    private function _compileFiles($files) {
+    private function _compileScriptFiles($files) {
         foreach ($files as $file) {
             $this->markScriptFileAsRendered($file);
         }
@@ -158,7 +158,7 @@ class ClientScriptManager extends TClientScriptManager {
 
     private function _renderLocalScriptFiles($writer, $localFiles) {
         if ($localFiles) {
-            $assetPath = $this->_compileFiles($localFiles);
+            $assetPath = $this->_compileScriptFiles($localFiles);
             $writer->write(TJavascript::renderScriptFile($assetPath));
         }
     }
@@ -224,15 +224,14 @@ class ClientScriptManager extends TClientScriptManager {
             $newLocalScripts = $this->_determineLocalScriptFiles($newScripts);
             $newRemoteScripts = array_diff($newScripts, $newLocalScripts);
             if ($newLocalScripts) {
-                $scriptUrls[] = $this->_compileFiles($newLocalScripts);
+                $scriptUrls[] = $this->_compileScriptFiles($newLocalScripts);
             }
             $scriptUrls = array_values(
                 array_unique(array_merge($scriptUrls, $newRemoteScripts))
             );
             return $scriptUrls;
-        } else {
-            return parent::getScriptUrls();
         }
+        return parent::getScriptUrls();
     }
 
     private $_scripts = [];
-- 
cgit v1.2.3