X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fui.js;h=352f7e78b6448a0fd4f5ef4ed0c677282ec90d6f;hp=560f48c9d8f0f461ac620f0b53cc79a23263ae8e;hb=003d56f8a1eee6825cc6c800f135e13df753770d;hpb=582d50fc8e75b19c1d07625d4ce759ea422b08f5

diff --git a/js/ui.js b/js/ui.js
index 560f48c..352f7e7 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -307,11 +307,19 @@ function saveTrackDump() {
 }
 
 function uploadTrack() {
+  // Hide all areas in the dialog.
   var dia = document.getElementById("dialogArea");
   var areas = dia.children;
   for (var i = 0; i <= areas.length - 1; i++) {
     areas[i].style.display = "none";
   }
+  // Reset all the fields in the status area.
+  document.getElementById("uploadStatusCloseButton").disabled = true;
+  document.getElementById("uploadInProgress").style.display = "block";
+  document.getElementById("uploadSuccess").style.display = "none";
+  document.getElementById("uploadErrorMsg").textContent = "";
+  document.getElementById("uploadError").style.display = "none";
+  // Now show the status area.
   document.getElementById("uploadStatus").style.display = "block";
 
   // See http://wiki.openstreetmap.org/wiki/Api06#Uploading_traces
@@ -325,22 +333,44 @@ function uploadTrack() {
   //formData.append("tags", "");
   formData.append("visibility",
                   document.getElementById("uploadVisibility").value);
-  var XHR = new XMLHttpRequest();
-  XHR.onreadystatechange = function() {
-    if (XHR.readyState == 4 && XHR.status == 200) {
-      // so far so good
-      reportUploadStatus(true);
-    } else if (XHR.readyState == 4 && XHR.status != 200) {
-      // fetched the wrong page or network error...
+  // Do an empty POST request first, so that we don't send everything,
+  // 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)) {
+      // 400 is Bad Request, but that's expected as this was empty.
+      // So far so good, init actual upload.
+      var XHR = new XMLHttpRequest();
+      XHR.onreadystatechange = function() {
+        if (XHR.readyState == 4 && XHR.status == 200) {
+          // Everthing looks fine.
+          reportUploadStatus(true);
+        } else if (XHR.readyState == 4 && XHR.status != 200) {
+          // Fetched the wrong page or network error...
+          reportUploadStatus(false);
+        }
+      };
+      XHR.open("POST", gOSMAPIURL + "api/0.6/gpx/create", true);
+      // Cross-Origin XHR doesn't allow username/password (HTTP Auth).
+      // So, we'll ask the user for entering credentials with rather ugly UI.
+      XHR.withCredentials = true;
+      try {
+        XHR.send(formData); // Send actual form data.
+      }
+      catch (e) {
+        reportUploadStatus(false, e);
+      }
+    } else if (hXHR.readyState == 4 && hXHR.status != 200) {
+      // Fetched the wrong page or network error...
       reportUploadStatus(false);
     }
   };
-  XHR.open("POST", gOSMAPIURL + "api/0.6/gpx/create", true);
+  hXHR.open("POST", gOSMAPIURL + "api/0.6/gpx/create", true);
   // Cross-Origin XHR doesn't allow username/password (HTTP Auth).
   // So, we'll ask the user for entering credentials with rather ugly UI.
-  XHR.withCredentials = true;
+  hXHR.withCredentials = true;
   try {
-    XHR.send(formData);
+    hXHR.send(); // Empty request, see above.
   }
   catch (e) {
     reportUploadStatus(false, e);
@@ -445,6 +475,24 @@ var gTrackStore = {
     }
   },
 
+  getListStepped: function(aCallback) {
+    if (!mainDB)
+      return;
+    var transaction = mainDB.transaction([this.objStore]);
+    var objStore = transaction.objectStore(this.objStore);
+    // Use cursor in reverse direction (so we get the most recent position first)
+    objStore.openCursor(null, "prev").onsuccess = function(event) {
+      var cursor = event.target.result;
+      if (cursor) {
+        aCallback(cursor.value);
+        cursor.continue();
+      }
+      else {
+        aCallback(null);
+      }
+    };
+  },
+
   push: function(aValue, aCallback) {
     if (!mainDB)
       return;