vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-22 01:07:56 +01:00
Code Issues Releases Wiki Activity

Reenabling Settings ok button when validation failed

Browse Source
This commit is contained in:
peteruithoven 2013-10-26 02:40:55 +02:00
parent 8550cc586a
commit 2e09d8bccb
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js_src/SettingsWindow.js
View File

@ -134,10 +134,14 @@ function SettingsWindow() {
disableButton(self.btnOK,self.submitwindow); disableButton(self.btnOK,self.submitwindow);
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
self.saveSettings(self.readForm(),function(){ self.saveSettings(self.readForm(),function(success){
self.hideSettings(function() { if(success) {
self.hideSettings(function() {
enableButton(self.btnOK,self.submitwindow);
});
} else {
enableButton(self.btnOK,self.submitwindow); enableButton(self.btnOK,self.submitwindow);
}); }
}); });
clearTimeout(self.retryRetrieveNetworkStatusDelay); clearTimeout(self.retryRetrieveNetworkStatusDelay);
@ -231,7 +235,7 @@ function SettingsWindow() {
console.log("Settings:saveSettings response: ",response); console.log("Settings:saveSettings response: ",response);
if(response.status == "error") { if(response.status == "error") {
clearTimeout(self.retrySaveSettingsDelay); clearTimeout(self.retrySaveSettingsDelay);
self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings(settings) },self.retryDelay); // retry after delay self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings(settings,complete) },self.retryDelay); // retry after delay
} else { } else {
var data = response.data; var data = response.data;
var validation = data.validation; var validation = data.validation;
@ -245,13 +249,13 @@ function SettingsWindow() {
} }
}); });
settings.substituted_ssid = data.substituted_ssid; settings.substituted_ssid = data.substituted_ssid;
if(complete && validated) complete(); if(complete) complete(validated);
} }
} }
}).fail(function() { }).fail(function() {
console.log("Settings:saveSettings: failed"); console.log("Settings:saveSettings: failed");
clearTimeout(self.retrySaveSettingsDelay); clearTimeout(self.retrySaveSettingsDelay);
self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings(settings) },self.retryDelay); // retry after delay self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings(settings,complete) },self.retryDelay); // retry after delay
}); });
} }
} }
@ -566,8 +570,8 @@ function SettingsWindow() {
if (communicateWithWifibox) { if (communicateWithWifibox) {
// save network related settings and on complete, connect to network // save network related settings and on complete, connect to network
self.saveSettings(self.readForm(),function() { self.saveSettings(self.readForm(),function(success) {
if(!success) return;
$.ajax({ $.ajax({
url: self.wifiboxCGIBinURL + "/network/associate", url: self.wifiboxCGIBinURL + "/network/associate",
type: "POST", type: "POST",
@ -597,7 +601,8 @@ function SettingsWindow() {
if (communicateWithWifibox) { if (communicateWithWifibox) {
// save network related settings and on complete, create access point // save network related settings and on complete, create access point
self.saveSettings(self.readForm(),function() { self.saveSettings(self.readForm(),function(success) {
if(!success) return;
self.setAPModeState(SettingsWindow.CREATING_AP); // get latest substituted ssid self.setAPModeState(SettingsWindow.CREATING_AP); // get latest substituted ssid
$.ajax({ $.ajax({
url: self.wifiboxCGIBinURL + "/network/openap", url: self.wifiboxCGIBinURL + "/network/openap",