Skip to content

Commit cdba6f9

Browse files
authored
Merge pull request projecthorus#30 from LukePrior/testing
Some fixes
2 parents aaa6039 + 664f82f commit cdba6f9

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

js/app.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,9 +1062,12 @@ $(window).ready(function() {
10621062
wvar.query = text;
10631063
stopFollow();
10641064
zoomed_in = false;
1065-
wvar.zoom = true;
1065+
if (sondePrefix.indexOf(wvar.query) > -1) {
1066+
wvar.zoom = false;
1067+
} else {
1068+
wvar.zoom = true;
1069+
}
10661070

1067-
if(text === "") { wvar.mode = null; }
10681071
clean_refresh(wvar.mode, true, true);
10691072
});
10701073
});

js/tracker.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var recoveries = [];
2323
var launches = null;
2424
var receiverCanvas = null;
2525

26-
var sondePrefix = ["RS92", "RS92-SGP", "RS92-NGP", "RS41", "RS41-SG", "RS41-SGP", "RS41-SGM", "DFM", "DFM06", "DFM09", "DFM17", "M10", "M20", "iMet-4", "iMet-54", "LMS6", "LMS6-400", "LMS6-1680", "iMS-100", "MRZ"];
26+
var sondePrefix = ["RS92", "RS92-SGP", "RS92-NGP", "RS41", "RS41-SG", "RS41-SGP", "RS41-SGM", "DFM", "DFM06", "DFM09", "DFM17", "M10", "M20", "iMet-4", "iMet-54", "LMS6", "LMS6-400", "LMS6-1680", "iMS-100", "MRZ", "chase"];
2727

2828
var got_positions = false;
2929
var zoomed_in = false;
@@ -55,7 +55,9 @@ var modeList = [
5555
"1 hour",
5656
"3 hours",
5757
"6 hours",
58-
"12 hours"
58+
"12 hours",
59+
"1 day",
60+
"3 days"
5961
];
6062
var modeDefault = "3 hours";
6163
var modeDefaultMobile = "1 hour";
@@ -2655,6 +2657,7 @@ function refresh() {
26552657
$("#stText").text("loading |");
26562658
response.fetch_timestamp = Date.now();
26572659
if (sondePrefix.indexOf(wvar.query) > -1) {
2660+
ajax_inprogress_old = "none";
26582661
update(response);
26592662
} else if (wvar.query != null) {
26602663
if (JSON.stringify(response).indexOf(wvar.query) == -1) {
@@ -2666,7 +2669,7 @@ function refresh() {
26662669
update(response);
26672670
}
26682671
} else {
2669-
ajax_inprogress_old = wvar.query;
2672+
ajax_inprogress_old = "none";
26702673
update(response);
26712674
}
26722675
$("#stText").text("");
@@ -3135,12 +3138,17 @@ function startAjax() {
31353138
function stopAjax() {
31363139
// stop our timed ajax
31373140
clearTimeout(periodical);
3141+
periodical = null;
3142+
ajax_inprogress = false;
31383143
if(ajax_positions) ajax_positions.abort();
31393144

31403145
clearTimeout(periodical_focus);
3146+
periodical_focus = null;
3147+
ajax_inprogress_single = false;
31413148
if(ajax_positions_single) ajax_positions_single.abort();
31423149

31433150
if(ajax_positions_old) ajax_positions_old.abort();
3151+
ajax_inprogress_old = "none";
31443152

31453153
clearTimeout(periodical_predictions);
31463154
periodical_predictions = null;

0 commit comments

Comments
 (0)