mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed webroot for scss files 

Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2017-12-27 11:01:27 +01:00
parent f13b3b6651
commit 00412d1c8c
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Template/CSSResourceLocator.php
View File

@ -104,7 +104,7 @@ class CSSResourceLocator extends ResourceLocator {
if($this->scssCacher !== null) {
if($this->scssCacher->process($root, $file, $app)) {
$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), false, true, true);
$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
return true;
} else {
$this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
@ -141,7 +141,7 @@ class CSSResourceLocator extends ResourceLocator {
}
}
$this->resources[] = array($webRoot? : '/', $webRoot, $file);
$this->resources[] = array($webRoot? : \OC::$WEBROOT, $webRoot, $file);
}
}
}

16
lib/private/Template/SCSSCacher.php
View File

@ -102,8 +102,21 @@ class SCSSCacher {
$fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS));
$path = implode('/', $path);
$webDir = null;
$webDir = substr($path, strlen($this->serverRoot)+1);
// Detect if path is within an app path
$app_paths = $this->config->getSystemValue('apps_paths');
if (!empty($app_paths)) {
foreach ($app_paths as $app_path) {
if (strpos($path, $app_path["path"]) === 0) {
$webDir = $app_path["url"].str_replace($app_path["path"], '', $path);
break;
}
}
}
if (is_null($webDir)) {
$webDir = substr($path, strlen($this->serverRoot));
}
try {
$folder = $this->appData->getFolder($app);
@ -294,7 +307,6 @@ class SCSSCacher {
* @return string
*/
public function getCachedSCSS($appName, $fileName) {
//var_dump([$appName, $fileName]);
$tmpfileLoc = explode('/', $fileName);
$fileName = array_pop($tmpfileLoc);
$fileName = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName));

13
tests/lib/Template/SCSSCacherTest.php
View File

@ -352,19 +352,10 @@ class SCSSCacherTest extends \Test\TestCase {
}
public function testRebaseUrls() {
$webDir = 'apps/files/css';
$webDir = '/apps/files/css';
$css = '#id { background-image: url(\'../img/image.jpg\'); }';
$actual = self::invokePrivate($this->scssCacher, 'rebaseUrls', [$css, $webDir]);
$expected = '#id { background-image: url(\'../../../apps/files/css/../img/image.jpg\'); }';
$this->assertEquals($expected, $actual);
}
public function testRebaseUrlsIgnoreFrontendController() {
$this->config->expects($this->once())->method('getSystemValue')->with('htaccess.IgnoreFrontController', false)->willReturn(true);
$webDir = 'apps/files/css';
$css = '#id { background-image: url(\'../img/image.jpg\'); }';
$actual = self::invokePrivate($this->scssCacher, 'rebaseUrls', [$css, $webDir]);
$expected = '#id { background-image: url(\'../../apps/files/css/../img/image.jpg\'); }';
$expected = '#id { background-image: url(\'/apps/files/css/../img/image.jpg\'); }';
$this->assertEquals($expected, $actual);
}