From e5c842d9239a33f286c07825cfa55ce66746db6c Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 24 Feb 2015 15:33:37 -0500
Subject: [PATCH] ability to send in extensions (comma delimited) to
 --from-file

---
 src/webserver.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/webserver.js b/src/webserver.js
index 01dee2b91c..849be56879 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -34,13 +34,25 @@ if(nconf.get('ssl')) {
 	var	port = nconf.get('port');
 
 	module.exports.init = function() {
+		var skipJS, skipLess, fromFile = nconf.get('from-file') || '';
+
 		emailer.registerApp(app);
 
+		if (fromFile.match('js')) {
+			winston.info('[minifier] Minifying client-side JS skipped');
+			skipJS = true;
+		}
+
+		if (fromFile.match('less')) {
+			winston.info('[minifier] Compiling LESS files skipped');
+			skipLess = true;
+		}
+
 		// Preparation dependent on plugins
 		plugins.ready(function() {
 			async.parallel([
-				async.apply(!nconf.get('from-file') ? meta.js.minify : meta.js.getFromFile, app.enabled('minification')),
-				async.apply(!nconf.get('from-file') ? meta.css.minify : meta.css.getFromFile),
+				async.apply(!skipJS ? meta.js.minify : meta.js.getFromFile, app.enabled('minification')),
+				async.apply(!skipLess ? meta.css.minify : meta.css.getFromFile),
 				async.apply(meta.sounds.init)
 			]);
 		});