Merge branch 'master' of linz:/srv/git/lantea

diff --git a/js/ui.js b/js/ui.js
index c2f64af6871f19ef2aa58580807a733e8163e1ac..7f0afd5c9890e76e0d6f6a193441da17e3df813a 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -66,7 +66,8 @@ function postInit(aEvent) {
   gAction.removeEventListener(aEvent.type, postInit, false);
   console.log("init done, draw map.");
   gMapPrefsLoaded = true;
-  gMap.resizeAndDraw();
+  //gMap.resizeAndDraw();  <-- HACK: This triggers bug 1001853, work around with a delay.
+  window.setTimeout(gMap.resizeAndDraw, 100);
   gActionLabel.textContent = "";
   gAction.style.display = "none";
   setTracking(document.getElementById("trackCheckbox"));

diff --git a/manifest.appcache b/manifest.appcache
index 9a5a5946ff7e804aeb9c288ecc0acbfa60e0f640..1133f56e9a223696a1c222d43794853f923d388a 100644 (file)
--- a/manifest.appcache
+++ b/manifest.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2014-04-08
+# 2014-05-12
 manifest.webapp
 js/map.js
 js/ui.js