cache error on init plot; clear appcache timeout properly

Author: rossengeorgiev

cache.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# version 60
+# version 63
 
 # gogole maps files
 http://maps.google.com/maps/api/js?v=3.10&sensor=false&key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg

js/app.js

@@ -11,9 +11,13 @@ if(
  || navigator.userAgent.match(/BlackBerry/i)
  ) is_mobile = true;
 
+$.ajaxSetup({ cache: true });
+
 // handle cachin events and display a loading bar
 var loadReload = false;
 var loadComplete = function(e) {
+    clearTimeout(initTimer);
+
     if(loadReload && e.type == 'updateready') {
         if(confirm("Reload app?")) {
             window.location.href = window.location.href;
@@ -32,12 +36,11 @@ function trackerInit() {
     $('header,#main,#map').show(); // interface elements
 
     if(!is_mobile) {
-        $('<script type="text/javascript" language="javascript" src="js/init_plot.js"></script>').appendTo('body');
+        $.getScript("js/init_plot.js", function() { checkSize(); if(!map) load(); });
         $('#telemetry_graph').addClass("main_screen").attr('style','');
+        return;
     }
     checkSize();
-
-
     if(!map) load();
 }
 

js/tracker.js

@@ -718,7 +718,7 @@ function addPosition(position) {
                             };
 
         // deep copy yaxes config for graph
-        $.each($.extend(false, plot_options.yaxes, {}), function(k,v) { vehicle_info.graph_yaxes.push(v) });
+        if(plot) $.each($.extend(false, plot_options.yaxes, {}), function(k,v) { vehicle_info.graph_yaxes.push(v) });
 
         vehicles.push(vehicle_info);
     }