Skip to content

Commit e86dbaa

Browse files
committed
compress and concat js and css
1 parent 20a1cf3 commit e86dbaa

File tree

4 files changed

+38
-9
lines changed

4 files changed

+38
-9
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*~
22
node_modules/
3+
public/draw.min.js
4+
public/style.min.css

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"jade": "1.6.x",
1010
"socket.io": "1.0.6",
1111
"redis": "0.12.x",
12-
"lzwcompress": "0.1.x"
12+
"lzwcompress": "0.1.x",
13+
"node-minify": "0.10.x"
1314
},
1415
"engines": {
1516
"node": "0.10.x",

server.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,38 @@ var localConnectedClients = 0;
1515
var clients = {};
1616
var netUsage = 0;
1717

18+
//compress all JS into one file on startup
19+
new compressor.minify({
20+
type: 'uglifyjs',
21+
fileIn: ['public/socket.io-1.0.6.min.js',
22+
'public/alertify.min.js',
23+
'public/jquery.hammer.min.js',
24+
'public/lzwCompress.js',
25+
'public/draw.js'
26+
],
27+
fileOut: 'public/draw.min.js',
28+
callback: function(err, min){
29+
if (err){
30+
console.log(err);
31+
}
32+
}
33+
});
34+
35+
//compress css
36+
new compressor.minify({
37+
type: 'clean-css',
38+
fileIn: ['public/alertify.core.css',
39+
'public/alertify.default.css',
40+
'public/style.css'
41+
],
42+
fileOut: 'public/style.min.css',
43+
callback: function(err, min){
44+
if(err){
45+
console.log(err);
46+
}
47+
}
48+
});
49+
1850
app.use(express.compress());
1951
app.use(express.static(__dirname + '/public', {maxAge: 60*60*24*1000}));
2052
app.use(express.logger());

views/main.jade

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ html
33
head
44
title Tim's Multiplayer Draw App
55
meta(name="viewport" content="initial-scale=1")
6-
link(rel="stylesheet" href="style.css")
7-
link(rel="stylesheet" href="alertify.core.css")
8-
link(rel="stylesheet" href="alertify.default.css")
6+
link(rel="stylesheet" href="style.min.css")
97
body
108
div#colourPanel
119
div#colourPanelTab C
@@ -39,10 +37,6 @@ html
3937
p node-multidraw v0.5 by <a href="http://timatooth.com">Tim Sullivan</a>
4038
p Source code on <a href="https://github.com/timatooth/node-multidraw">GitHub</a>
4139
input(type="text" id="chatBox" placeholder="Chat" maxlength="135")
42-
script(src="socket.io-1.0.6.min.js")
4340
script(src="http://code.jquery.com/jquery-2.1.1.min.js")
44-
script(src="jquery.hammer.min.js")
45-
script(src="alertify.min.js")
46-
script(src="lzwCompress.js")
47-
script(src="draw.js")
41+
script(src="draw.min.js")
4842

0 commit comments

Comments
 (0)