X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=js%2Fui.js;h=650b9cee6a36ae904bc358d2265ed0cbd60e82a5;hp=f0d2b189b0d97773caed08ecc7d61b741420600b;hb=b9707ee0b1b3aa200085539b2894a811bf67f650;hpb=6ddefbf98ebff13592de1d87a3bfc2796ac06d84 diff --git a/js/ui.js b/js/ui.js index f0d2b18..650b9ce 100644 --- 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"; @@ -333,22 +345,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 && (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(); + 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);