summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2016-04-29 14:03:17 +0200
committeremkael <emkael@tlen.pl>2016-04-29 14:03:17 +0200
commit85f4c67f0843e5f5ad0260097efb385565daf5a2 (patch)
treed37a5ffe7847092080fd7a360268c42b5d5d9e72 /app
parent558eb849057849bac4b2acabad790a6e846dc37b (diff)
* compileFiles method renamed, as stylesheet compilation is coming
Diffstat (limited to 'app')
-rw-r--r--app/php/web/ClientScriptManager.php9
1 files changed, 4 insertions, 5 deletions
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 = [];