fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 21:12:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect ordering of CSS resources

Browse source
This commit is contained in:
Kijin Sung 2020-09-04 23:44:21 +09:00
parent 36135c0fac
commit 215f143e70
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/frontendfile/FrontEndFileHandler.class.php
View file

@ -229,11 +229,11 @@ class FrontEndFileHandler extends Handler
{ {
$file->media = 'all'; $file->media = 'all';
} }
$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media; $file->key = sprintf('%s/%s:%s:%s', $file->filePath, $file->keyName, $file->targetIe, $file->media);
} }
else if($file->fileExtension == 'js') else if($file->fileExtension == 'js')
{ {
$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe; $file->key = sprintf('%s/%s:%s', $file->filePath, $file->keyName, $file->targetIe);
} }
return $file; return $file;
@ -675,7 +675,7 @@ class FrontEndFileHandler extends Handler
*/ */
protected function _arrangeCssIndex($dirname, $file) protected function _arrangeCssIndex($dirname, $file)
{ {
if ($file->index !== 0) if ($file->index < -100000)
{ {
return; return;
} }
@ -688,7 +688,7 @@ class FrontEndFileHandler extends Handler
$tmp = array_first(explode('/', strtr($dirname, '\\.', '//'))); $tmp = array_first(explode('/', strtr($dirname, '\\.', '//')));
$cssSortList = array('common' => -100000, 'layouts' => -90000, 'modules' => -80000, 'widgets' => -70000, 'addons' => -60000); $cssSortList = array('common' => -100000, 'layouts' => -90000, 'modules' => -80000, 'widgets' => -70000, 'addons' => -60000);
$file->index = $cssSortList[$tmp]; $file->index += $cssSortList[$tmp];
} }
/** /**