X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fui.js;h=f737507ecfa6fe453acac9727123e9235550f694;hp=a44a4625ee1f9b8ae1e64213795da61642d637a2;hb=ba819f24b220ff62afb6ecdb5ff7727631c1d1b5;hpb=6201b11296e29c248fcdd84c5f3237754fd98b60;ds=sidebyside

diff --git a/js/ui.js b/js/ui.js
index a44a462..f737507 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -14,13 +14,6 @@ var gTrackUpdateInterval;
 var gAction, gActionLabel;
 var gBackendURL = "https://backend.lantea.kairo.at";
 var gAuthClientID = "lantea";
-var gOSMAPIURL = "https://api.openstreetmap.org/";
-var gOSMOAuthData = {
-    oauth_consumer_key: "6jjWwlbhGqyYeCdlFE1lTGG6IRGOv1yKpFxkcq2z",
-    oauth_secret: "A21gUeDM6mdoQgbA9uF7zJ13sbUQrNG7QQ4oSrKA",
-    url: "https://www.openstreetmap.org",
-    landing: "auth-done.html",
-}
 
 window.onload = function() {
   if (/\/login\.html/.test(window.location)) {
@@ -39,7 +32,7 @@ window.onload = function() {
     mSel.add(opt, null);
   }
 
-  var areas = document.getElementsByClassName("overlayArea");
+  var areas = document.getElementsByClassName("autoFade");
   for (var i = 0; i <= areas.length - 1; i++) {
     areas[i].addEventListener("mouseup", uiEvHandler, false);
     areas[i].addEventListener("mousemove", uiEvHandler, false);
@@ -74,6 +67,8 @@ window.onload = function() {
     gAuthClientID += "-dev";
   }
 
+  document.getElementById("libCloseButton").onclick = hideLibrary;
+
   // Set up the login area.
   document.getElementById("loginbtn").onclick = startLogin;
   document.getElementById("logoutbtn").onclick = doLogout;
@@ -85,11 +80,6 @@ window.onload = function() {
     // Call any UI preparation that needs the backend.
   });
 
-  if (gDebug) {
-    // Note that GPX upload returns an error 500 on the dev API right now.
-    gOSMAPIURL = "http://api06.dev.openstreetmap.org/";
-  }
-
   gAction.addEventListener("dbinit-done", initMap, false);
   gAction.addEventListener("mapinit-done", postInit, false);
   console.log("starting DB init...");
@@ -106,17 +96,11 @@ function postInit(aEvent) {
   gActionLabel.textContent = "";
   gAction.style.display = "none";
   setTracking(document.getElementById("trackCheckbox"));
-  gPrefs.get(gDebug ? "osm_dev_user" : "osm_user", function(aValue) {
+  gPrefs.get("devicename", function(aValue) {
     if (aValue) {
-      document.getElementById("uploadUser").value = aValue;
-      document.getElementById("uploadTrackButton").disabled = false;
+      document.getElementById("uploadDevName").value = aValue;
     }
   });
-  gPrefs.get(gDebug ? "osm_dev_pwd" : "osm_pwd", function(aValue) {
-    var upwd = document.getElementById("uploadPwd");
-    if (aValue)
-      document.getElementById("uploadPwd").value = aValue;
-  });
 }
 
 window.onresize = function() {
@@ -219,6 +203,7 @@ function displayLogin() {
   document.getElementById("username").classList.remove("hidden");
   document.getElementById("username").textContent = userData.email;
   document.getElementById("uploadTrackButton").disabled = false;
+  document.getElementById("libraryShowLine").classList.remove("hidden");
   document.getElementById("logoutbtn").classList.remove("hidden");
 }
 
@@ -227,6 +212,7 @@ function displayLogout() {
   document.getElementById("username").classList.add("hidden");
   document.getElementById("username").textContent = "";
   document.getElementById("uploadTrackButton").disabled = true;
+  document.getElementById("libraryShowLine").classList.add("hidden");
   document.getElementById("loginbtn").classList.remove("hidden");
   document.getElementById("logindesc").classList.remove("hidden");
 }
@@ -274,7 +260,7 @@ function initDB(aEvent) {
 
 function showUI() {
   if (gUIHideCountdown <= 0) {
-    var areas = document.getElementsByClassName('overlayArea');
+    var areas = document.getElementsByClassName('autoFade');
     for (var i = 0; i <= areas.length - 1; i++) {
       areas[i].classList.remove("hidden");
     }
@@ -286,7 +272,7 @@ function showUI() {
 function maybeHideUI() {
   gUIHideCountdown--;
   if (gUIHideCountdown <= 0) {
-    var areas = document.getElementsByClassName('overlayArea');
+    var areas = document.getElementsByClassName('autoFade');
     for (var i = 0; i <= areas.length - 1; i++) {
       areas[i].classList.add("hidden");
     }
@@ -309,6 +295,7 @@ function updateTrackInfo() {
 function toggleTrackArea() {
   var fs = document.getElementById("trackArea");
   if (fs.classList.contains("hidden")) {
+    prepareLoginButton();
     fs.classList.remove("hidden");
     showUI();
     gTrackUpdateInterval = setInterval(updateTrackInfo, 1000);
@@ -400,12 +387,8 @@ var uiEvHandler = {
 
 function setUploadField(aField) {
   switch (aField.id) {
-    case "uploadUser":
-      gPrefs.set(gDebug ? "osm_dev_user" : "osm_user", aField.value);
-      document.getElementById("uploadTrackButton").disabled = !aField.value.length;
-      break;
-    case "uploadPwd":
-      gPrefs.set(gDebug ? "osm_dev_pwd" : "osm_pwd", aField.value);
+    case "uploadDevName":
+      gPrefs.set("devicename", aField.value);
       break;
   }
 }
@@ -497,7 +480,8 @@ function uploadTrack() {
   var desc = document.getElementById("uploadDesc").value;
   formData.append("comment",
                   desc.length ? desc : "Track recorded via Lantea Maps");
-  //formData.append("devicename", "");
+  formData.append("devicename",
+                  document.getElementById("uploadDevName").value);
   formData.append("public",
                   document.getElementById("uploadPublic").value);
 
@@ -673,7 +657,14 @@ function fetchBackend(aEndpoint, aMethod, aSendData, aCallback, aCallbackForward
       var result = {};
       if (XHR.getResponseHeader("Content-Type") == "application/json") {
         // Got a JSON object, see if we have success.
-        result = JSON.parse(XHR.responseText);
+        try {
+          result = JSON.parse(XHR.responseText);
+        }
+        catch (e) {
+          console.log(e);
+          result = {"error": e,
+                    "message": XHR.responseText};
+        }
       }
       else {
         result = XHR.responseText;