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

[lantea.git] / js / ui.js

diff --git a/js/ui.js b/js/ui.js
index f451fbe52932ec53f900bcd15943431e99b49d76..60abf40a4b42793f331645f98e9adbc04a6193c0 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -17,11 +17,6 @@ var gBackendURL = "https://backend.lantea.kairo.at";
 var gAuthClientID = "lantea";
 
 window.onload = function() {
-  if (/\/login\.html/.test(window.location)) {
-    // If we are in the login window, call a function to complete the process and don't do anything else here.
-    completeLoginWindow();
-    return;
-  }
   gAction = document.getElementById("action");
   gActionLabel = document.getElementById("actionlabel");
 
@@ -175,16 +170,6 @@ function prepareLoginButton(aCallback) {
   );
 }
 
-function completeLoginWindow() {
-  if (window.opener) {
-    window.opener.finishLogin(getParameterByName("code"), getParameterByName("state"));
-    window.close();
-  }
-  else {
-    document.getElementById("logininfo").textContent = "You have called this document outside of the login flow, which is not supported.";
-  }
-}
-
 function finishLogin(aCode, aState) {
   if (aState == authData["state"]) {
     fetchBackend("login?code=" + aCode + "&state=" + aState + "&redirect_uri=" + encodeURIComponent(getRedirectURI()), "GET", null,
@@ -527,21 +512,31 @@ function uploadTrack() {
       if (aStatusCode >= 400) {
         reportUploadStatus(false, aResult);
       }
-      else {
+      else if (aResult["id"]) {
         reportUploadStatus(true);
       }
+      else { // If no ID is returned, we assume a general error.
+        reportUploadStatus(false);
+      }
     }
   );
 }
 
-function reportUploadStatus(aSuccess, aMessage) {
+function reportUploadStatus(aSuccess, aResponse) {
   document.getElementById("uploadStatusCloseButton").disabled = false;
   document.getElementById("uploadInProgress").style.display = "none";
   if (aSuccess) {
     document.getElementById("uploadSuccess").style.display = "block";
   }
-  else if (aMessage) {
-    document.getElementById("uploadErrorMsg").textContent = aMessage;
+  else if (aResponse["message"]) {
+    document.getElementById("uploadErrorMsg").textContent = aResponse["message"];
+    if (aResponse["errortype"]) {
+      document.getElementById("uploadErrorMsg").textContent += " (" + aResponse["errortype"] + ")";
+    }
+    document.getElementById("uploadError").style.display = "block";
+  }
+  else if (aResponse) {
+    document.getElementById("uploadErrorMsg").textContent = aResponse;
     document.getElementById("uploadError").style.display = "block";
   }
   else {
@@ -719,11 +714,3 @@ function fetchBackend(aEndpoint, aMethod, aSendData, aCallback, aCallbackForward
     aCallback(e, 500, aCallbackForwards);
   }
 }
-
-function getParameterByName(aName) {
-  // from http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript
-  name = aName.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-  var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-      results = regex.exec(location.search);
-  return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-}