Skip to content

Commit 29616aa

Browse files
argiloargilo
authored
Remove YUI Compressor and use plain JavaScript (projecthorus#341)
1 parent b742291 commit 29616aa

File tree

10 files changed

+59
-69
lines changed

10 files changed

+59
-69
lines changed

‎.gitignore‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
*.swp
22
*.pyc
33
*.log
4-
js/mobile.js
5-
js/init_plot.js
6-
js/version.json
7-
css/mobile.css
4+
/index.html
5+
/js/version.json
86
cache.manifest
9-
tiles/
7+
tiles/

‎DEVELOPER_README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ To get a copy of the code and run a test web server:
44

55
1. [Fork the repository](https://github.com/projecthorus/sondehub-tracker/fork) by visiting [https://github.com/projecthorus/sondehub-tracker/fork](https://github.com/projecthorus/sondehub-tracker/fork).
66
2. Clone the repository with your git tool of choice.
7-
3. Run `build.sh` to compile the javascript files. (This requires Java to be installed and in your path.)
7+
3. Run `build.sh` to generate `index.html` and `js/version.json`.
88
4. Run `python serve.py` to run a simple web server to (This requires python 3.x)
99
5. Visit [http://localhost:8000](http://localhost:8000) to view the local version of the server!

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:latest
22

3-
RUN apk add --no-cache python3 openjdk11 sed git
3+
RUN apk add --no-cache python3 sed git
44

55
WORKDIR /app
66
ADD . .

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ Pull requests are welcome.
3636

3737
## Installation
3838

39-
Requirements: Java
40-
4139
$ git clone https://github.com/projecthorus/sondehub-tracker.git
4240
$ ./build.sh
4341
$ python serve.py

‎build.sh‎

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,18 @@
11
#!/bin/bash
22

3-
# compile stylesheet
4-
echo -n "Compiling CSS... "
5-
cd css
6-
rm -f mobile.css
7-
cat base.css skeleton.css layout.css habitat-font.css main.css leaflet.css leaflet.fullscreen.css skewt.css > mobile.tmp
8-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=css mobile.tmp > mobile.css
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 init_plot.js
17-
# precompiled libs
18-
cat jquery* >> mobile.js
3+
set -e
194

205
VERSION="`git rev-parse --short HEAD`"
21-
226
BUILD_DATE="`date -u +%Y-%m-%dT%H:%M:%SZ`"
237

24-
# compile the rest
25-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge iscroll.js >> mobile.js
26-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge chasecar.lib.js | sed "s/{VER}/$VERSION/" >> mobile.js
27-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge tracker.js >> mobile.js
28-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge app.js | sed "s/{VER}/$VERSION/" | sed "s/{BUILD_DATE}/$BUILD_DATE/" >> mobile.js
29-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge colour-map.js >> mobile.js
30-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge xdata.js >> mobile.js
31-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge station.js >> mobile.js
32-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge format.js >> mobile.js
33-
34-
#compile plot lib and config
35-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge _jquery.flot.js >> init_plot.js
36-
java -jar "../tools/yuicompressor-2.4.8.jar" --type=js --disable-optimizations --nomunge plot_config.js >> init_plot.js
37-
388
# create version check file
39-
echo "{\"build_date\": \"$BUILD_DATE\", \"version\": \"$VERSION\", \"refresh\": 86400}" > version.json
40-
41-
cd ..
9+
echo -n "Generating js/version.json... "
10+
echo "{\"build_date\": \"$BUILD_DATE\", \"version\": \"$VERSION\", \"refresh\": 86400}" > js/version.json
4211
echo "Done!"
4312

4413
# cache fixes
45-
sed -i'' "s/{VER}/$VERSION/" index.html
46-
sed -i'' "s/{VER}/$VERSION/" service-worker.js
47-
14+
echo -n "Generating index.html... "
15+
sed -e "s/{VER}/$VERSION/" -e "s/{BUILD_DATE}/$BUILD_DATE/" index.template.html > index.html
4816
echo "Done!"
4917

5018
echo "Build version: $VERSION Build date: $BUILD_DATE"

index.html renamed to index.template.html

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@
1919
<link rel="icon" type="image/x-icon" href="favicon.ico" />
2020
<link rel="manifest" href="manifest.json">
2121

22-
<link rel="stylesheet" href="css/mobile.css"/>
22+
<link rel="stylesheet" href="css/base.css"/>
23+
<link rel="stylesheet" href="css/skeleton.css"/>
24+
<link rel="stylesheet" href="css/layout.css"/>
25+
<link rel="stylesheet" href="css/habitat-font.css"/>
26+
<link rel="stylesheet" href="css/main.css"/>
27+
<link rel="stylesheet" href="css/leaflet.css"/>
28+
<link rel="stylesheet" href="css/leaflet.fullscreen.css"/>
29+
<link rel="stylesheet" href="css/skewt.css"/>
2330

2431
</head>
25-
<body>
32+
<body data-version="{VER}" data-build-date="{BUILD_DATE}">
2633

2734
<div id="loading">
2835
<div>
@@ -420,22 +427,23 @@ <h3>Report Recovery</h3>
420427
<script type="text/javascript" language="javascript" src="https://www.google.com/recaptcha/api.js" async defer></script>
421428
<script type="text/javascript" language="javascript" src="https://xc5dqkj2cgb1.statuspage.io/embed/script.js" async defer></script>
422429
<script type="text/javascript" language="javascript" src="js/skewt.js?v={VER}"></script>
423-
<script type="text/javascript" language="javascript" src="js/aws-sdk-2.1029.0.min.js?v={VER}"></script>
430+
<script type="text/javascript" language="javascript" src="js/aws-sdk-2.1029.0.min.js"></script>
424431
<script type="text/javascript" language="javascript" src="js/leaflet.js?v={VER}"></script>
425432
<script type="text/javascript" language="javascript" src="js/Leaflet.fullscreen.min.js?v={VER}"></script>
426433
<script type="text/javascript" language="javascript" src="js/L.Terminator.js?v={VER}"></script>
427434
<script type="text/javascript" language="javascript" src="js/L.TileLayer.NoGap.js?v={VER}"></script>
428435
<script type="text/javascript" language="javascript" src="js/paho-mqtt.js?v={VER}"></script>
429-
<!--
430-
<script type="text/javascript" language="javascript" src="js/iscroll.js"></script>
436+
431437
<script type="text/javascript" language="javascript" src="js/jquery-1.12.4-min.js"></script>
432-
<script type="text/javascript" language="javascript" src="js/jquery-ui.min.js"></script>
433-
<script type="text/javascript" language="javascript" src="js/chasecar.lib.js"></script>
434-
<script type="text/javascript" language="javascript" src="js/tracker.js"></script>
435-
<script type="text/javascript" language="javascript" src="js/tracker.js"></script>
436-
<script type="text/javascript" language="javascript" src="js/color-map.js"></script>
437-
-->
438-
<script type="text/javascript" language="javascript" src="js/mobile.js?v={VER}"></script>
438+
<script type="text/javascript" language="javascript" src="js/iscroll.js?v={VER}"></script>
439+
<script type="text/javascript" language="javascript" src="js/chasecar.lib.js?v={VER}"></script>
440+
<script type="text/javascript" language="javascript" src="js/tracker.js?v={VER}"></script>
441+
<script type="text/javascript" language="javascript" src="js/app.js?v={VER}"></script>
442+
<script type="text/javascript" language="javascript" src="js/colour-map.js?v={VER}"></script>
443+
<script type="text/javascript" language="javascript" src="js/xdata.js?v={VER}"></script>
444+
<script type="text/javascript" language="javascript" src="js/station.js?v={VER}"></script>
445+
<script type="text/javascript" language="javascript" src="js/format.js?v={VER}"></script>
446+
439447
<script type="text/javascript" language="javascript" src="js/rbush.js?v={VER}"></script>
440448
<script type="text/javascript" language="javascript" src="js/pwa.js?v={VER}"></script>
441449

‎js/app.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@ function trackerInit() {
207207
if(is_mobile || wvar.enabled) $(".nav .wvar").hide();
208208

209209
if(!is_mobile) {
210-
$.getScript("js/init_plot.js", function() { checkSize(); if(!map) load(); });
210+
$.getScript("js/_jquery.flot.js", function() {
211+
$.getScript("js/plot_config.js", function() { checkSize(); if(!map) load(); });
212+
});
211213
if(wvar.graph) $('#telemetry_graph').attr('style','');
212214

213215
return;
@@ -485,17 +487,15 @@ var updateTime = function(date) {
485487
}
486488
};
487489

488-
const version = "{VER}";
489-
490490
$(window).ready(function() {
491491
// refresh timebox
492492
setInterval(function() {
493493
updateTime(new Date());
494494
}, 1000);
495495

496496
// Update Tracker version info
497-
$('#build_version').text(version);
498-
$('#build_date').text("{BUILD_DATE}");
497+
$('#build_version').text(document.body.dataset.version);
498+
$('#build_date').text(document.body.dataset.buildDate);
499499

500500
// resize elements if needed
501501
checkSize();
@@ -1033,7 +1033,7 @@ function check_version(){
10331033
fetch(updateRequest)
10341034
.then(function(response){ return response.json()})
10351035
.then(function(response){
1036-
if (response['version'] != version) {
1036+
if (response['version'] != document.body.dataset.version) {
10371037
window.clearInterval(update_check)
10381038
reload_timer = window.setTimeout(update_site, response['refresh']*1000)
10391039
reload_end_time = new Date().getTime() +response['refresh']*1000

‎js/chasecar.lib.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ChaseCar.updatePosition = function(callsign, position) {
2424

2525
var _doc = {
2626
"software_name": "SondeHub Tracker",
27-
"software_version": "{VER}",
27+
"software_version": document.body.dataset.version,
2828
"uploader_callsign": callsign,
2929
"uploader_position": [position.coords.latitude, position.coords.longitude, _position_alt],
3030
"uploader_antenna": "Mobile Station",

‎service-worker.js‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,36 @@
11
self.addEventListener('install', function(event) {
22
event.waitUntil(
3-
caches.open("{VER}").then(function(cache) {
3+
caches.open(document.body.dataset.version).then(function(cache) {
44
return cache.addAll(
55
[
6-
'/css/mobile.css',
6+
'/css/base.css',
7+
'/css/skeleton.css',
8+
'/css/layout.css',
9+
'/css/habitat-font.css',
10+
'/css/main.css',
711
'/css/leaflet.css',
812
'/css/leaflet.fullscreen.css',
13+
'/css/skewt.css',
14+
'/js/skewt.js',
15+
'/js/aws-sdk-2.1029.0.min.js',
916
'/js/leaflet.js',
1017
'/js/Leaflet.fullscreen.min.js',
1118
'/js/L.Terminator.js',
12-
'/js/mobile.js',
19+
'/js/L.TileLayer.NoGap.js',
20+
'/js/paho-mqtt.js',
21+
'/js/jquery-1.12.4-min.js',
22+
'/js/iscroll.js',
23+
'/js/chasecar.lib.js',
24+
'/js/tracker.js',
25+
'/js/app.js',
26+
'/js/colour-map.js',
27+
'/js/xdata.js',
28+
'/js/station.js',
29+
'/js/format.js',
1330
'/js/rbush.js',
1431
'/js/pwa.js',
15-
'/js/init_plot.js',
32+
'/js/_jquery.flot.js',
33+
'/js/plot_config.js',
1634
'/img/markers/balloon.svg',
1735
'/img/markers/car.svg',
1836
'/img/markers/parachute.svg',

‎tools/yuicompressor-2.4.8.jar‎

-769 KB
Binary file not shown.

0 commit comments

Comments
 (0)