Skip to content

Commit b7105ca

Browse files
rossengeorgievrossengeorgiev
committed
minify javascripts via YUI
* updated build.sh * all javascripts compile into a single file (which is included) Overall result: 25% smaller size, 1 request instead of 8
1 parent 0fabf4d commit b7105ca

File tree

7 files changed

+34
-1123
lines changed

7 files changed

+34
-1123
lines changed

‎build.sh‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
#!/bin/bash
2+
3+
# compile stylesheet
4+
echo -n "Compiling CSS... "
25
cd css
3-
rm mobile.css
6+
rm -f mobile.css
47
cat base.css skeleton.css layout.css habitat-font.css main.css > mobile.tmp
58
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=css mobile.tmp > mobile.css
6-
rm mobile.tmp
9+
rm -f mobile.tmp
10+
cd ..
11+
echo "Done!"
12+
13+
#compile javascript
14+
echo -n "Compiling JavaScript... "
15+
cd js
16+
rm -f mobile.js
17+
# precompiled libs
18+
cat jquery* iscroll.js >> mobile.js
19+
20+
# compile the rest
21+
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge BDCCCircle.js >> mobile.js
22+
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge PolylineEncoder.js >> mobile.js
23+
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge balloonmarker.js >> mobile.js
24+
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge chasecar.lib.js >> mobile.js
25+
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge tracker.js >> mobile.js
26+
java -jar "../tools/yuicompressor-2.4.8pre.jar" --type=js --disable-optimizations --nomunge app.js >> mobile.js
27+
28+
cd ..
29+
echo "Done!"

‎index.html‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<!DOCTYPE html>
2-
<!--[if lt IE 7 ]><html class="ie ie6" lang="en"> <![endif]-->
3-
<!--[if IE 7 ]><html class="ie ie7" lang="en"> <![endif]-->
4-
<!--[if IE 8 ]><html class="ie ie8" lang="en"> <![endif]-->
5-
<!--[if (gte IE 9)|!(IE)]><!--><html lang="en"> <!--<![endif]-->
2+
<html lang="en">
63
<head>
74
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
85
<title>habitat mobile tracker</title>
@@ -11,15 +8,6 @@
118
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
129
<link rel="stylesheet" href="css/mobile.css"/>
1310
<link rel="shortcut icon" href="favicon.ico" />
14-
<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=false&amp;key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg" type="text/javascript"></script>
15-
<script type="text/javascript" language="javascript" src="js/jquery-1.8.3-min.js"></script>
16-
<script type="text/javascript" language="javascript" src="js/iscroll.js"></script>
17-
<script type="text/javascript" language="javascript" src="js/chasecar.lib.js"></script>
18-
<script src="js/PolylineEncoder.js" type="text/javascript"></script>
19-
<script src="js/balloonmarker.js" type="text/javascript"></script>
20-
<script src="js/BDCCCircle.js" type="text/javascript"></script>
21-
<script src="js/tracker.js?nocache=1" type="text/javascript"></script>
22-
<script type="text/javascript" language="javascript" src="js/app.js?nocache=1"></script>
2311
</head>
2412
<body onload="load();">
2513

@@ -103,5 +91,7 @@ <h2>Chase car mode</h2>
10391
<div class="landscape"></div>
10492
</div>
10593
</div>
94+
<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=false&amp;key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg" type="text/javascript"></script>
95+
<script type="text/javascript" language="javascript" src="js/mobile.js"></script>
10696
</body>
10797
</html>

‎js/chasecar.lib.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ ChaseCar.request = function(doc) {
3939
return;
4040
} else {
4141
ChaseCar.uused++;
42-
var uuid = ChaseCar._uuids.shift(); // pop the first uuid
43-
var doc = ChaseCar.queue.shift(); // pop the first doc on queue
42+
// get one uuid and one doc from the queue and push to habitat
43+
var uuid = ChaseCar._uuids.shift(), doc = ChaseCar.queue.shift();
4444

4545
// update doc with uuids and time of upload
4646
doc._id = uuid;

0 commit comments

Comments
 (0)