From 0dce8647ba3767ae70d951660839939e23dfa849 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 27 May 2014 15:15:01 -0400 Subject: [PATCH] closes #1476 --- src/middleware/middleware.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 6022c1e38d..973158516c 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -248,13 +248,20 @@ middleware.renderHeader = function(req, res, callback) { }); - templateValues.useCustomCSS = false; - if (meta.config.useCustomCSS === '1') { - templateValues.useCustomCSS = true; - templateValues.customCSS = meta.config.customCSS; - } - async.parallel({ + customCSS: function(next) { + templateValues.useCustomCSS = parseInt(meta.config.useCustomCSS, 10) === 1; + if (!templateValues.useCustomCSS) { + return next(null, ''); + } + + var less = require('less'); + var parser = new (less.Parser)(); + + parser.parse(meta.config.customCSS, function(err, tree) { + next(err, tree ? tree.toCSS({cleancss: true}) : ''); + }); + }, title: function(next) { if (uid) { user.getSettings(uid, function(err, settings) { @@ -285,6 +292,7 @@ middleware.renderHeader = function(req, res, callback) { templateValues.browserTitle = results.title; templateValues.isAdmin = results.isAdmin || false; templateValues.user = results.user; + templateValues.customCSS = results.customCSS; app.render('header', templateValues, callback); });