issue #322 - minifying css file and added jquery to minified compilation

12 years ago · d7ea24e218
parent e621d7e601
commit d7ea24e218
3 changed files with 3 additions and 3 deletions
--- a/app.js
+++ b/app.js
@ -73,6 +73,7 @@

 		// Minify JS
 		var toMinify = [
+			'/vendor/jquery/js/jquery.js',
 			'/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js',
 			'/vendor/jquery/js/jquery.timeago.js',
 			'/vendor/bootstrap/js/bootstrap.min.js',
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@ -8,7 +8,6 @@
 	<script>
 		var RELATIVE_PATH = "{relative_path}";
 	</script>
-	<script src="http://code.jquery.com/jquery.js"></script>
 	<script src="{relative_path}/socket.io/socket.io.js"></script>
 	<script src="{relative_path}/src/nodebb.min.js"></script>
 	<script>
@ -19,7 +18,6 @@
 	</script>

 	<link rel="stylesheet" type="text/css" href="{relative_path}/css/nodebb.css" />
-
 </head>

 <body>
--- a/src/webserver.js
+++ b/src/webserver.js
@ -63,7 +63,8 @@ var express = require('express'),
 	app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
 	app.use(require('less-middleware')({
 		src: path.join(__dirname, '../', 'public'),
-		prefix: nconf.get('relative_path')
+		prefix: nconf.get('relative_path'),
+		yuicompress: true
 	}));
 	app.use(nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
 	app.use(express.bodyParser()); // Puts POST vars in request.body