Skip to content

Commit b7d5b03

Browse files
not loading on error cache event
1 parent 9c0b3eb commit b7d5b03

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

cache.manifest

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
CACHE MANIFEST
2-
# version 14
2+
# version 16
33

44
# gogole maps files
55
http://maps.google.com/maps/api/js?v=3.10&sensor=false&key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg
66
http://maps.gstatic.com/intl/en_us/mapfiles/api-3/10/20/main.js
77
http://maps.gstatic.com/cat_js/intl/en_us/mapfiles/api-3/10/20/%7Bcommon,map,util,geometry,poly,overlay%7D.js
8+
http://maps.gstatic.com/cat_js/intl/en_us/mapfiles/api-3/10/20/%7Bcommon,util,stats%7D.js
9+
http://maps.gstatic.com/cat_js/intl/en_us/mapfiles/api-3/10/20/%7Bcommon,map,util,geometry,poly,overlay,stats%7D.js
810
http://maps.gstatic.com/cat_js/intl/en_us/mapfiles/api-3/10/20/%7Bstats%7D.js
911
http://maps.gstatic.com/cat_js/intl/en_us/mapfiles/api-3/10/20/%7Bonion%7D.js
12+
http://maps.gstatic.com/cat_js/intl/en_us/mapfiles/api-3/10/20/%7Bcontrols%7D.js
1013
http://maps.gstatic.com/mapfiles/openhand_8_8.cur
1114
http://maps.gstatic.com/mapfiles/transparent.png
15+
http://maps.gstatic.com/mapfiles/undo_poly.png
16+
http://maps.gstatic.com/mapfiles/arrow-down.png
1217

1318
# app files
1419
img/logo.png

js/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ cache.addEventListener('checking', function() { $('#loading .bar,#loading').show
2424
cache.addEventListener('noupdate', loadComplete, false);
2525
cache.addEventListener('updateready', loadComplete, false);
2626
cache.addEventListener('cached', loadComplete, false);
27+
cache.addEventListener('error', loadComplete, false);
2728
cache.addEventListener('progress', function(e) { $('#loading .complete').stop(true,true).animate({width: (200/e.total)*e.loaded}); }, false);
2829

2930
var listScroll;

js/mobile.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/tracker.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ var Z_SHADOW = 4;
4444
var Z_CAR = 5;
4545
var Z_PAYLOAD = 6;
4646

47+
// localStorage vars
48+
var ls_receivers = false;
49+
var ls_pred = false;
50+
4751

4852
var offline = {
4953
get: function(key) {
@@ -766,7 +770,7 @@ function refreshReceivers() {
766770
updateReceivers(response);
767771
},
768772
error: function() {
769-
if(!zoomed_in && offline.get('opt_offline')) updateReceivers(offline.get('receivers'));
773+
if(!ls_receivers && offline.get('opt_offline')) updateReceivers(offline.get('receivers'));
770774
},
771775
complete: function(request, textStatus) {
772776
periodical_listeners = setTimeout(refreshReceivers, 60 * 1000);
@@ -785,7 +789,7 @@ function refreshPredictions() {
785789
updatePredictions(response);
786790
},
787791
error: function() {
788-
if(!zoomed_in && offline.get('opt_offline')) updatePredictions(offline.get('predictions'));
792+
if(!ls_pred && offline.get('opt_offline')) updatePredictions(offline.get('predictions'));
789793
},
790794
complete: function(request, textStatus) {
791795
periodical_predictions = setTimeout(refreshPredictions, 2 * timer_seconds * 1000);
@@ -864,6 +868,7 @@ function updateReceiverMarker(receiver) {
864868

865869
function updateReceivers(r) {
866870
if(!r) return;
871+
ls_receivers = true;
867872

868873
for(var i = 0, ii = r.length; i < ii; i++) {
869874
var lat = parseFloat(r[i].lat);
@@ -888,6 +893,7 @@ function updateReceivers(r) {
888893

889894
function updatePredictions(r) {
890895
if(!r) return;
896+
ls_pred = true;
891897

892898
for(var i = 0, ii = r.length; i < ii; i++) {
893899
var vehicle_index = $.inArray(r[i].vehicle, vehicle_names);

0 commit comments

Comments
 (0)