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

more progress on #5211

Browse Source
This commit is contained in:
Julian Lam
2016-11-16 20:54:57 -05:00
parent 9bf0f6c5cd
commit 299fcb99f1
5 changed files with 38 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/meta/css.js
View File

@@ -81,25 +81,9 @@ module.exports = function (Meta) {
acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";\n';
acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";';
var fromFile = nconf.get('from-file') || '';
async.series([
function (next) {
if (fromFile.match('clientLess')) {
winston.info('[minifier] Compiling front-end LESS files skipped');
return Meta.css.getFromFile(path.join(__dirname, '../../public/stylesheet.css'), 'cache', next);
}
minify(source, paths, 'cache', next);
},
function (next) {
if (fromFile.match('acpLess')) {
winston.info('[minifier] Compiling ACP LESS files skipped');
return Meta.css.getFromFile(path.join(__dirname, '../../public/admin.css'), 'acpCache', next);
}
minify(acpSource, paths, 'acpCache', next);
}
async.apply(minify, source, paths, 'cache'),
async.apply(minify, acpSource, paths, 'acpCache')
], function (err, minified) {
if (err) {
return callback(err);
@@ -109,8 +93,8 @@ module.exports = function (Meta) {
if (process.send) {
process.send({
action: 'css-propagate',
cache: fromFile.match('clientLess') ? Meta.css.cache : minified[0],
acpCache: fromFile.match('acpLess') ? Meta.css.acpCache : minified[1]
cache: minified[0],
acpCache: minified[1]
});
}
@@ -122,6 +106,30 @@ module.exports = function (Meta) {
});
};
Meta.css.getFromFile = function(callback) {
async.series([
async.apply(Meta.css.loadFile, path.join(__dirname, '../../public/stylesheet.css'), 'cache'),
async.apply(Meta.css.loadFile, path.join(__dirname, '../../public/admin.css'), 'acpCache')
], function (err, minified) {
if (err) {
return callback(err);
}
// Propagate to other workers
if (process.send) {
process.send({
action: 'css-propagate',
cache: Meta.css.cache,
acpCache: Meta.css.acpCache
});
}
emitter.emit('meta:css.compiled');
callback();
});
};
function getStyleSource(files, prefix, extension, callback) {
var pluginDirectories = [],
source = '';
@@ -166,7 +174,7 @@ module.exports = function (Meta) {
});
};
Meta.css.getFromFile = function (filePath, filename, callback) {
Meta.css.loadFile = function (filePath, filename, callback) {
winston.verbose('[meta/css] Reading stylesheet ' + filePath.split('/').pop() + ' from file');
fs.readFile(filePath, function (err, file) {