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

Merge branch 'master' into fix-vendors

Browse Source
This commit is contained in:
Julian Lam
2016-04-04 18:46:24 -04:00
parent b73af30a2b 1aaf65e9be
commit f91f705f90
610 changed files with 7299 additions and 3194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/webserver.js
View File

@@ -78,11 +78,6 @@ function initializeNodeBB(callback) {
skipJS = true;
}
if (fromFile.match('less')) {
winston.info('[minifier] Compiling LESS files skipped');
skipLess = true;
}
async.waterfall([
async.apply(cacheStaticFiles),
async.apply(meta.themes.setupPaths),
@@ -90,13 +85,14 @@ function initializeNodeBB(callback) {
plugins.init(app, middleware, next);
},
function(next) {
async.parallel([
async.series([
async.apply(meta.templates.compile),
async.apply(meta.js.symlinkModules),
async.apply(!skipJS ? meta.js.minify : meta.js.getFromFile, 'nodebb.min.js'),
async.apply(!skipJS ? meta.js.minify : meta.js.getFromFile, 'acp.min.js'),
async.apply(!skipLess ? meta.css.minify : meta.css.getFromFile),
async.apply(meta.sounds.init)
async.apply(meta.css.minify),
async.apply(meta.sounds.init),
async.apply(meta.blacklist.load)
], next);
},
function(results, next) {