Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for retrieving css cache

Browse Source
This commit is contained in:
psychobunny
2016-03-24 13:29:50 -04:00
parent 5008e211e2
commit 000d5b61c7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/meta/css.js
View File

@@ -85,7 +85,7 @@ module.exports = function(Meta) {
function(next) { function(next) {
if (fromFile.match('clientLess')) { if (fromFile.match('clientLess')) {
winston.info('[minifier] Compiling front-end LESS files skipped'); winston.info('[minifier] Compiling front-end LESS files skipped');
return Meta.css.getFromFile(path.join(__dirname, '../../public/stylesheet.css'), Meta.css.cache, next); return Meta.css.getFromFile(path.join(__dirname, '../../public/stylesheet.css'), 'cache', next);
} }
minify(source, paths, 'cache', next); minify(source, paths, 'cache', next);
@@ -93,7 +93,7 @@ module.exports = function(Meta) {
function(next) { function(next) {
if (fromFile.match('acpLess')) { if (fromFile.match('acpLess')) {
winston.info('[minifier] Compiling ACP LESS files skipped'); winston.info('[minifier] Compiling ACP LESS files skipped');
return Meta.css.getFromFile(path.join(__dirname, '../../public/admin.css'), Meta.css.acpCache, next); return Meta.css.getFromFile(path.join(__dirname, '../../public/admin.css'), 'acpCache', next);
} }
minify(acpSource, paths, 'acpCache', next); minify(acpSource, paths, 'acpCache', next);
@@ -107,8 +107,8 @@ module.exports = function(Meta) {
if (process.send) { if (process.send) {
process.send({ process.send({
action: 'css-propagate', action: 'css-propagate',
cache: minified[0], cache: fromFile.match('clientLess') ? Meta.css.cache : minified[0],
acpCache: minified[1] acpCache: fromFile.match('acpLess') ? Meta.css.acpCache : minified[1]
}); });
} }
@@ -162,11 +162,11 @@ module.exports = function(Meta) {
}); });
}; };
Meta.css.getFromFile = function(filePath, cache, callback) { Meta.css.getFromFile = function(filePath, filename, callback) {
winston.verbose('[meta/css] Reading stylesheet ' + filePath.split('/').pop() + ' from file'); winston.verbose('[meta/css] Reading stylesheet ' + filePath.split('/').pop() + ' from file');
fs.readFile(filePath, function(err, file) { fs.readFile(filePath, function(err, file) {
cache = file; Meta.css[filename] = file;
callback(); callback();
}); });
}; };