Webserver: -fix: serveraddess is not saved
This commit is contained in:
1 parent
57770da524
commit
8b6f461fe0
1 file changed
+7
-4
@@ -722,14 +722,13 @@ function pagebeforeshowDiscover() {
|
|||||||
if (address != null) {
|
if (address != null) {
|
||||||
var prom = request({ url: address + "isServerOnline" }, "Checking...").done(function () {
|
var prom = request({ url: address + "isServerOnline" }, "Checking...").done(function () {
|
||||||
serverBaseAddress = address;
|
serverBaseAddress = address;
|
||||||
window.localStorage.getItem("VocaluxeServerAddress", address);
|
window.localStorage.setItem("VocaluxeServerAddress", address);
|
||||||
$.mobile.changePage("#login", { transition: "none" });
|
$.mobile.changePage("#login", { transition: "none" });
|
||||||
});
|
});
|
||||||
$(this).data('promise', prom);
|
$(this).data('promise', prom);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$.mobile.changePage("#login", { transition: "none" });
|
$.mobile.changePage("#login", { transition: "none" });
|
||||||
}
|
}
|
||||||
@@ -924,10 +923,14 @@ function initDiscoverPageHandler() {
|
|||||||
if (address.slice(-1) != '/') {
|
if (address.slice(-1) != '/') {
|
||||||
address = address + '/';
|
address = address + '/';
|
||||||
}
|
}
|
||||||
request({ url: address + "isServerOnline" }, "Checking...").done(function () {
|
request({ url: address + "isServerOnline" }, "Checking...")
|
||||||
|
.done(function () {
|
||||||
serverBaseAddress = address;
|
serverBaseAddress = address;
|
||||||
window.localStorage.getItem("VocaluxeServerAddress", address);
|
window.localStorage.setItem("VocaluxeServerAddress", address);
|
||||||
$.mobile.changePage("#login", { transition: "slidefade" });
|
$.mobile.changePage("#login", { transition: "slidefade" });
|
||||||
|
})
|
||||||
|
.fail(function () {
|
||||||
|
$('#discoverServerAddress').prop("value", "");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user