remove 2D canvas, move draw() and resizeAndDraw() into gMap, only use stored position...

[lantea.git] / js / ui.js

diff --git a/js/ui.js b/js/ui.js
index 352f7e78b6448a0fd4f5ef4ed0c677282ec90d6f..650b9cee6a36ae904bc358d2265ed0cbd60e82a5 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -23,7 +23,7 @@ window.onload = function() {
     mSel.add(opt, null);
   }
 
-  var areas = document.getElementsByClassName('overlayArea');
+  var areas = document.getElementsByClassName("overlayArea");
   for (var i = 0; i <= areas.length - 1; i++) {
     areas[i].addEventListener("mouseup", uiEvHandler, false);
     areas[i].addEventListener("mousemove", uiEvHandler, false);
@@ -65,7 +65,7 @@ function postInit(aEvent) {
   gAction.removeEventListener(aEvent.type, postInit, false);
   console.log("init done, draw map.");
   gMapPrefsLoaded = true;
-  resizeAndDraw();
+  gMap.resizeAndDraw();
   gActionLabel.textContent = "";
   gAction.style.display = "none";
   setTracking(document.getElementById("trackCheckbox"));
@@ -83,7 +83,7 @@ function postInit(aEvent) {
 }
 
 window.onresize = function() {
-  resizeAndDraw();
+  gMap.resizeAndDraw();
 }
 
 function initDB(aEvent) {
@@ -208,6 +208,16 @@ function showUploadDialog() {
   dia.classList.remove("hidden");
 }
 
+function showGLWarningDialog() {
+  var dia = document.getElementById("dialogArea");
+  var areas = dia.children;
+  for (var i = 0; i <= areas.length - 1; i++) {
+    areas[i].style.display = "none";
+  }
+  document.getElementById("noGLwarning").style.display = "block";
+  dia.classList.remove("hidden");
+}
+
 function cancelDialog() {
   document.getElementById("dialogArea").classList.add("hidden");
   document.getElementById("uploadTrackButton").disabled = false;
@@ -246,8 +256,9 @@ function setUploadField(aField) {
 function makeISOString(aTimestamp) {
   // ISO time format is YYYY-MM-DDTHH:mm:ssZ
   var tsDate = new Date(aTimestamp);
+  // Note that .getUTCMonth() returns a number between 0 and 11 (0 for January)!
   return tsDate.getUTCFullYear() + "-" +
-         (tsDate.getUTCMonth() < 10 ? "0" : "") + tsDate.getUTCMonth() + "-" +
+         (tsDate.getUTCMonth() < 9 ? "0" : "") + (tsDate.getUTCMonth() + 1 ) + "-" +
          (tsDate.getUTCDate() < 10 ? "0" : "") + tsDate.getUTCDate() + "T" +
          (tsDate.getUTCHours() < 10 ? "0" : "") + tsDate.getUTCHours() + ":" +
          (tsDate.getUTCMinutes() < 10 ? "0" : "") + tsDate.getUTCMinutes() + ":" +
@@ -317,8 +328,9 @@ function uploadTrack() {
   document.getElementById("uploadStatusCloseButton").disabled = true;
   document.getElementById("uploadInProgress").style.display = "block";
   document.getElementById("uploadSuccess").style.display = "none";
-  document.getElementById("uploadErrorMsg").textContent = "";
+  document.getElementById("uploadFailed").style.display = "none";
   document.getElementById("uploadError").style.display = "none";
+  document.getElementById("uploadErrorMsg").textContent = "";
   // Now show the status area.
   document.getElementById("uploadStatus").style.display = "block";
 
@@ -337,7 +349,7 @@ function uploadTrack() {
   // then ask for credentials, and then send again.
   var hXHR = new XMLHttpRequest();
   hXHR.onreadystatechange = function() {
-    if (hXHR.readyState == 4 && (XHR.status == 200 || hXHR.status == 400)) {
+    if (hXHR.readyState == 4 && (hXHR.status == 200 || hXHR.status == 400)) {
       // 400 is Bad Request, but that's expected as this was empty.
       // So far so good, init actual upload.
       var XHR = new XMLHttpRequest();