mirror of
https://github.com/Doodle3D/doodle3d-client.git
synced 2024-11-26 02:54:54 +01:00
Formatting of SettingsWindow.js.
This commit is contained in:
parent
5eb129d2a2
commit
74b9149175
@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
//these settings are defined in the firmware (conf_defaults.lua) and will be initialized in loadSettings()
|
//these settings are defined in the firmware (conf_defaults.lua) and will be initialized in loadSettings()
|
||||||
var settings = { }
|
var settings = {};
|
||||||
var settingsPopup;
|
var settingsPopup;
|
||||||
//wrapper to prevent scoping issues in showSettings()
|
//wrapper to prevent scoping issues in showSettings()
|
||||||
function openSettingsWindow() {
|
function openSettingsWindow() {
|
||||||
@ -18,7 +18,7 @@ function openSettingsWindow() {
|
|||||||
|
|
||||||
function SettingsWindow() {
|
function SettingsWindow() {
|
||||||
this.wifiboxURL;
|
this.wifiboxURL;
|
||||||
this.wifiboxCGIBinURL
|
this.wifiboxCGIBinURL;
|
||||||
this.window;
|
this.window;
|
||||||
this.btnOK;
|
this.btnOK;
|
||||||
this.form;
|
this.form;
|
||||||
@ -29,7 +29,7 @@ function SettingsWindow() {
|
|||||||
|
|
||||||
this.retryLoadSettingsDelay; // retry setTimout instance
|
this.retryLoadSettingsDelay; // retry setTimout instance
|
||||||
this.retrySaveSettingsDelay; // retry setTimout instance
|
this.retrySaveSettingsDelay; // retry setTimout instance
|
||||||
this.retryResetSettingsDelay // retry setTimout instance
|
this.retryResetSettingsDelay; // retry setTimout instance
|
||||||
this.retryRetrieveNetworkStatusDelay;// retry setTimout instance
|
this.retryRetrieveNetworkStatusDelay;// retry setTimout instance
|
||||||
|
|
||||||
this.apFieldSet;
|
this.apFieldSet;
|
||||||
@ -49,7 +49,7 @@ function SettingsWindow() {
|
|||||||
this.retrieveNetworkStatusDelayTime = 1000;
|
this.retrieveNetworkStatusDelayTime = 1000;
|
||||||
|
|
||||||
this.restoredStateHideDelayTime = 3000;
|
this.restoredStateHideDelayTime = 3000;
|
||||||
this.restoredStateHideDelay // setTimout instance
|
this.restoredStateHideDelay; // setTimout instance
|
||||||
|
|
||||||
// Events
|
// Events
|
||||||
SettingsWindow.SETTINGS_LOADED = "settingsLoaded";
|
SettingsWindow.SETTINGS_LOADED = "settingsLoaded";
|
||||||
@ -58,19 +58,19 @@ function SettingsWindow() {
|
|||||||
SettingsWindow.NOT_CONNECTED = "not connected"; // also used as first item in networks list
|
SettingsWindow.NOT_CONNECTED = "not connected"; // also used as first item in networks list
|
||||||
SettingsWindow.CONNECTED = "connected";
|
SettingsWindow.CONNECTED = "connected";
|
||||||
SettingsWindow.CONNECTING = "connecting";
|
SettingsWindow.CONNECTING = "connecting";
|
||||||
SettingsWindow.CONNECTING_FAILED = "connecting failed"
|
SettingsWindow.CONNECTING_FAILED = "connecting failed";
|
||||||
|
|
||||||
// network access point mode states
|
// network access point mode states
|
||||||
SettingsWindow.NO_AP = "no ap";
|
SettingsWindow.NO_AP = "no ap";
|
||||||
SettingsWindow.AP = "ap";
|
SettingsWindow.AP = "ap";
|
||||||
SettingsWindow.CREATING_AP = "creating ap";
|
SettingsWindow.CREATING_AP = "creating ap";
|
||||||
|
|
||||||
SettingsWindow.API_CONNECTING_FAILED = -1
|
SettingsWindow.API_CONNECTING_FAILED = -1;
|
||||||
SettingsWindow.API_NOT_CONNECTED = 0
|
SettingsWindow.API_NOT_CONNECTED = 0;
|
||||||
SettingsWindow.API_CONNECTING = 1
|
SettingsWindow.API_CONNECTING = 1;
|
||||||
SettingsWindow.API_CONNECTED = 2
|
SettingsWindow.API_CONNECTED = 2;
|
||||||
SettingsWindow.API_CREATING = 3
|
SettingsWindow.API_CREATING = 3;
|
||||||
SettingsWindow.API_CREATED = 4
|
SettingsWindow.API_CREATED = 4;
|
||||||
|
|
||||||
// network mode
|
// network mode
|
||||||
SettingsWindow.NETWORK_MODE_NEITHER = "neither";
|
SettingsWindow.NETWORK_MODE_NEITHER = "neither";
|
||||||
@ -98,7 +98,7 @@ function SettingsWindow() {
|
|||||||
console.log("Settings:finished loading settings.html, now loading settings...");
|
console.log("Settings:finished loading settings.html, now loading settings...");
|
||||||
|
|
||||||
self.form = self.window.find("form");
|
self.form = self.window.find("form");
|
||||||
self.form.submit(function (e) { self.submitwindow(e) });
|
self.form.submit(function (e) { self.submitwindow(e); });
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: self.wifiboxURL + "/printer/listall",
|
url: self.wifiboxURL + "/printer/listall",
|
||||||
@ -147,15 +147,17 @@ function SettingsWindow() {
|
|||||||
});
|
});
|
||||||
}); //this.window.find
|
}); //this.window.find
|
||||||
|
|
||||||
} //this.init
|
}; //this.init
|
||||||
|
|
||||||
this.openSettings = function() {
|
this.openSettings = function() {
|
||||||
self.loadSettings(function() { // reload settings
|
self.loadSettings(function() { // reload settings
|
||||||
settingsPopup.open();
|
settingsPopup.open();
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
this.closeSettings = function(complete) {
|
this.closeSettings = function(complete) {
|
||||||
settingsPopup.close(complete);
|
settingsPopup.close(complete);
|
||||||
}
|
};
|
||||||
|
|
||||||
this.submitwindow = function(e) {
|
this.submitwindow = function(e) {
|
||||||
disableButton(self.btnOK,self.submitwindow);
|
disableButton(self.btnOK,self.submitwindow);
|
||||||
@ -173,11 +175,11 @@ function SettingsWindow() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
clearTimeout(self.retryRetrieveNetworkStatusDelay);
|
clearTimeout(self.retryRetrieveNetworkStatusDelay);
|
||||||
}
|
};
|
||||||
|
|
||||||
this.loadSettings = function(complete) {
|
this.loadSettings = function(complete) {
|
||||||
if (!communicateWithWifibox) {
|
if (!communicateWithWifibox) {
|
||||||
console.log(" communicateWithWifibox is false: settings aren't being loaded from wifibox...")
|
console.log(" communicateWithWifibox is false: settings aren't being loaded from wifibox...");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
console.log("Settings:loadSettings() >> getting new data...");
|
console.log("Settings:loadSettings() >> getting new data...");
|
||||||
@ -197,42 +199,43 @@ function SettingsWindow() {
|
|||||||
}).fail(function() {
|
}).fail(function() {
|
||||||
console.log("Settings:loadSettings: failed");
|
console.log("Settings:loadSettings: failed");
|
||||||
clearTimeout(self.retryLoadSettingsDelay);
|
clearTimeout(self.retryLoadSettingsDelay);
|
||||||
self.retryLoadSettingsDelay = setTimeout(function() { self.loadSettings() },self.retryDelay); // retry after delay
|
self.retryLoadSettingsDelay = setTimeout(function() { self.loadSettings(); },self.retryDelay); // retry after delay
|
||||||
});
|
});
|
||||||
|
|
||||||
this.refreshNetworks();
|
this.refreshNetworks();
|
||||||
this.retrieveNetworkStatus(false);
|
this.retrieveNetworkStatus(false);
|
||||||
}
|
};
|
||||||
|
|
||||||
this.fillForm = function(settings,form) {
|
this.fillForm = function(settings,form) {
|
||||||
if(!form) form = this.form; // if no form specified, fill whole form
|
if(!form) form = this.form; // if no form specified, fill whole form
|
||||||
|
|
||||||
//fill form with loaded settings
|
//fill form with loaded settings
|
||||||
var selects = form.find("select");
|
var selects = form.find("select");
|
||||||
selects.each( function(index,element) {
|
selects.each( function(index,element) {
|
||||||
var element = $(element);
|
var elem = $(element);
|
||||||
element.val(settings[element.attr('name')]);
|
elem.val(settings[elem.attr('name')]);
|
||||||
});
|
});
|
||||||
var inputs = form.find("input");
|
var inputs = form.find("input");
|
||||||
inputs.each( function(index,element) {
|
inputs.each( function(index,element) {
|
||||||
var element = $(element);
|
var elem = $(element);
|
||||||
//console.log("printer setting input: ",index,element.attr("type"),element.attr('name')); //,element);
|
//console.log("printer setting input: ",index,element.attr("type"),element.attr('name')); //,element);
|
||||||
switch(element.attr("type")) {
|
switch(elem.attr("type")) {
|
||||||
case "text":
|
case "text":
|
||||||
case "number":
|
case "number":
|
||||||
element.val(settings[element.attr('name')]);
|
elem.val(settings[elem.attr('name')]);
|
||||||
break;
|
break;
|
||||||
case "checkbox":
|
case "checkbox":
|
||||||
element.prop('checked', settings[element.attr('name')]);
|
elem.prop('checked', settings[elem.attr('name')]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
var textareas = form.find("textarea");
|
var textareas = form.find("textarea");
|
||||||
textareas.each( function(index,element) {
|
textareas.each( function(index,element) {
|
||||||
var element = $(element);
|
var elem = $(element);
|
||||||
var value = settings[element.attr('name')];
|
var value = settings[elem.attr('name')];
|
||||||
element.val(value);
|
elem.val(value);
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
this.saveSettings = function(newSettings,complete) {
|
this.saveSettings = function(newSettings,complete) {
|
||||||
settings = newSettings; // store new settings in global settings
|
settings = newSettings; // store new settings in global settings
|
||||||
@ -247,7 +250,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,complete) },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;
|
||||||
@ -267,10 +270,11 @@ function SettingsWindow() {
|
|||||||
}).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,complete) },self.retryDelay); // retry after delay
|
self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings(settings,complete); },self.retryDelay); // retry after delay
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
this.resetSettings = function() {
|
this.resetSettings = function() {
|
||||||
console.log("resetSettings");
|
console.log("resetSettings");
|
||||||
//$("#restoreSettings").addClass("disabled");
|
//$("#restoreSettings").addClass("disabled");
|
||||||
@ -292,7 +296,7 @@ function SettingsWindow() {
|
|||||||
console.log("Settings:resetSettings response: ",response);
|
console.log("Settings:resetSettings response: ",response);
|
||||||
if(response.status == "error") {
|
if(response.status == "error") {
|
||||||
clearTimeout(self.retryResetSettingsDelay);
|
clearTimeout(self.retryResetSettingsDelay);
|
||||||
self.retryResetSettingsDelay = setTimeout(function() { self.resetSettings() },self.retryDelay); // retry after delay
|
self.retryResetSettingsDelay = setTimeout(function() { self.resetSettings(); },self.retryDelay); // retry after delay
|
||||||
} else {
|
} else {
|
||||||
settings = response.data;
|
settings = response.data;
|
||||||
console.log(" settings: ",settings);
|
console.log(" settings: ",settings);
|
||||||
@ -309,47 +313,50 @@ function SettingsWindow() {
|
|||||||
}).fail(function() {
|
}).fail(function() {
|
||||||
console.log("Settings:resetSettings: failed");
|
console.log("Settings:resetSettings: failed");
|
||||||
clearTimeout(self.retryResetSettingsDelay);
|
clearTimeout(self.retryResetSettingsDelay);
|
||||||
self.retryResetSettingsDelay = setTimeout(function() { self.resetSettings() },self.retryDelay); // retry after delay
|
self.retryResetSettingsDelay = setTimeout(function() { self.resetSettings(); },self.retryDelay); // retry after delay
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
this.setRestoreState = function(text) {
|
this.setRestoreState = function(text) {
|
||||||
self.restoreStateField.html(text);
|
self.restoreStateField.html(text);
|
||||||
}
|
};
|
||||||
|
|
||||||
this.displayValidationError = function(key,msg) {
|
this.displayValidationError = function(key,msg) {
|
||||||
var formElement = self.form.find("[name|='"+key+"']");
|
var formElement = self.form.find("[name|='"+key+"']");
|
||||||
formElement.addClass("error");
|
formElement.addClass("error");
|
||||||
var errorMsg = "<p class='errorMsg'>"+msg+"</p>"
|
var errorMsg = "<p class='errorMsg'>"+msg+"</p>";
|
||||||
formElement.after(errorMsg);
|
formElement.after(errorMsg);
|
||||||
}
|
};
|
||||||
|
|
||||||
this.clearValidationErrors = function() {
|
this.clearValidationErrors = function() {
|
||||||
self.form.find(".errorMsg").remove();
|
self.form.find(".errorMsg").remove();
|
||||||
self.form.find(".error").removeClass("error");
|
self.form.find(".error").removeClass("error");
|
||||||
}
|
};
|
||||||
|
|
||||||
this.readForm = function() {
|
this.readForm = function() {
|
||||||
//console.log("SettingsWindow:readForm");
|
//console.log("SettingsWindow:readForm");
|
||||||
var settings = {};
|
var settings = {};
|
||||||
var selects = self.form.find("select");
|
var selects = self.form.find("select");
|
||||||
selects.each( function(index,element) {
|
selects.each( function(index,element) {
|
||||||
var element = $(element);
|
var elem = $(element);
|
||||||
var fieldName = element.attr('name');
|
//var fieldName = elem.attr('name');
|
||||||
if(element.attr('name') != "") {
|
if(elem.attr('name') != "") {
|
||||||
settings[element.attr('name')] = element.val();
|
settings[elem.attr('name')] = elem.val();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var inputs = self.form.find("input");
|
var inputs = self.form.find("input");
|
||||||
inputs.each( function(index,element) {
|
inputs.each( function(index,element) {
|
||||||
var element = $(element);
|
var elem = $(element);
|
||||||
if(element.attr('name') != "") {
|
if(elem.attr('name') != "") {
|
||||||
switch(element.attr("type")) {
|
switch(elem.attr("type")) {
|
||||||
case "text":
|
case "text":
|
||||||
case "number":
|
case "number":
|
||||||
settings[element.attr('name')] = element.val();
|
settings[elem.attr('name')] = elem.val();
|
||||||
break;
|
break;
|
||||||
case "checkbox":
|
case "checkbox":
|
||||||
settings[element.attr('name')] = element.prop('checked')
|
settings[elem.attr('name')] = elem.prop('checked');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -357,12 +364,12 @@ function SettingsWindow() {
|
|||||||
|
|
||||||
var textareas = self.form.find("textarea");
|
var textareas = self.form.find("textarea");
|
||||||
textareas.each( function(index,element) {
|
textareas.each( function(index,element) {
|
||||||
var element = $(element);
|
var elem = $(element);
|
||||||
settings[element.attr('name')] = element.val();
|
settings[elem.attr('name')] = elem.val();
|
||||||
});
|
});
|
||||||
//console.log(settings);
|
//console.log(settings);
|
||||||
return settings;
|
return settings;
|
||||||
}
|
};
|
||||||
|
|
||||||
this.signin = function() {
|
this.signin = function() {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
@ -376,11 +383,11 @@ function SettingsWindow() {
|
|||||||
}).fail(function() {
|
}).fail(function() {
|
||||||
console.log("Settings:signin: failed");
|
console.log("Settings:signin: failed");
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
this.downloadlogs = function() {
|
this.downloadlogs = function() {
|
||||||
window.location.href = self.wifiboxURL + "/info/logfiles"
|
window.location.href = self.wifiboxURL + "/info/logfiles";
|
||||||
}
|
};
|
||||||
|
|
||||||
this.downloadGcode = function() {
|
this.downloadGcode = function() {
|
||||||
var gcode = generate_gcode();
|
var gcode = generate_gcode();
|
||||||
@ -388,7 +395,7 @@ function SettingsWindow() {
|
|||||||
var blob = new Blob([gcode.join("\n")], {type: "text/plain;charset=utf-8"});
|
var blob = new Blob([gcode.join("\n")], {type: "text/plain;charset=utf-8"});
|
||||||
saveAs(blob, "doodle3d.gcode");
|
saveAs(blob, "doodle3d.gcode");
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
this.downloadSvg = function() {
|
this.downloadSvg = function() {
|
||||||
var svg = saveToSvg();
|
var svg = saveToSvg();
|
||||||
@ -396,7 +403,7 @@ function SettingsWindow() {
|
|||||||
var blob = new Blob([svg], {type: "text/plain;charset=utf-8"});
|
var blob = new Blob([svg], {type: "text/plain;charset=utf-8"});
|
||||||
saveAs(blob, "doodle3d.svg");
|
saveAs(blob, "doodle3d.svg");
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Networks ui
|
* Networks ui
|
||||||
@ -404,11 +411,13 @@ function SettingsWindow() {
|
|||||||
this.showAPSettings = function() {
|
this.showAPSettings = function() {
|
||||||
self.apFieldSet.show();
|
self.apFieldSet.show();
|
||||||
self.clientFieldSet.hide();
|
self.clientFieldSet.hide();
|
||||||
}
|
};
|
||||||
|
|
||||||
this.showClientSettings = function() {
|
this.showClientSettings = function() {
|
||||||
self.clientFieldSet.show();
|
self.clientFieldSet.show();
|
||||||
self.apFieldSet.hide();
|
self.apFieldSet.hide();
|
||||||
}
|
};
|
||||||
|
|
||||||
this.refreshNetworks = function() {
|
this.refreshNetworks = function() {
|
||||||
console.log("Settings:refreshNetworks");
|
console.log("Settings:refreshNetworks");
|
||||||
|
|
||||||
@ -424,7 +433,7 @@ function SettingsWindow() {
|
|||||||
//clearTimeout(self.retrySaveSettingsDelay);
|
//clearTimeout(self.retrySaveSettingsDelay);
|
||||||
//self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings() },self.retryDelay); // retry after delay
|
//self.retrySaveSettingsDelay = setTimeout(function() { self.saveSettings() },self.retryDelay); // retry after delay
|
||||||
} else {
|
} else {
|
||||||
var networks = response.data.networks
|
var networks = response.data.networks;
|
||||||
self.networks = {};
|
self.networks = {};
|
||||||
var foundCurrentNetwork = false;
|
var foundCurrentNetwork = false;
|
||||||
var networkSelector = self.form.find("#network");
|
var networkSelector = self.form.find("#network");
|
||||||
@ -451,7 +460,7 @@ function SettingsWindow() {
|
|||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
this.retrieveNetworkStatus = function(connecting) {
|
this.retrieveNetworkStatus = function(connecting) {
|
||||||
//console.log("Settings:retrieveNetworkStatus");
|
//console.log("Settings:retrieveNetworkStatus");
|
||||||
@ -499,7 +508,7 @@ function SettingsWindow() {
|
|||||||
self.currentLocalIP = data.localip;
|
self.currentLocalIP = data.localip;
|
||||||
self.selectNetwork(data.ssid);
|
self.selectNetwork(data.ssid);
|
||||||
} else {
|
} else {
|
||||||
self.currentLocalIP = ""
|
self.currentLocalIP = "";
|
||||||
}
|
}
|
||||||
self.networkMode = SettingsWindow.NETWORK_MODE_CLIENT;
|
self.networkMode = SettingsWindow.NETWORK_MODE_CLIENT;
|
||||||
break;
|
break;
|
||||||
@ -558,7 +567,7 @@ function SettingsWindow() {
|
|||||||
case SettingsWindow.API_CONNECTING:
|
case SettingsWindow.API_CONNECTING:
|
||||||
case SettingsWindow.API_CREATING:
|
case SettingsWindow.API_CREATING:
|
||||||
clearTimeout(self.retryRetrieveNetworkStatusDelay);
|
clearTimeout(self.retryRetrieveNetworkStatusDelay);
|
||||||
self.retryRetrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(connecting) },self.retryRetrieveNetworkStatusDelayTime); // retry after delay
|
self.retryRetrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(connecting); },self.retryRetrieveNetworkStatusDelayTime); // retry after delay
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -567,15 +576,15 @@ function SettingsWindow() {
|
|||||||
}).fail(function() {
|
}).fail(function() {
|
||||||
console.log("Settings:retrieveNetworkStatus: failed");
|
console.log("Settings:retrieveNetworkStatus: failed");
|
||||||
clearTimeout(self.retryRetrieveNetworkStatusDelay);
|
clearTimeout(self.retryRetrieveNetworkStatusDelay);
|
||||||
self.retryRetrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(connecting) },self.retryDelay); // retry after delay
|
self.retryRetrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(connecting); },self.retryDelay); // retry after delay
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
this.networkSelectorChanged = function(e) {
|
this.networkSelectorChanged = function(e) {
|
||||||
var selectedOption = $(this).find("option:selected");
|
var selectedOption = $(this).find("option:selected");
|
||||||
self.selectNetwork(selectedOption.val());
|
self.selectNetwork(selectedOption.val());
|
||||||
}
|
};
|
||||||
|
|
||||||
this.selectNetwork = function(ssid) {
|
this.selectNetwork = function(ssid) {
|
||||||
console.log("select network: ",ssid);
|
console.log("select network: ",ssid);
|
||||||
@ -593,15 +602,17 @@ function SettingsWindow() {
|
|||||||
}
|
}
|
||||||
this.form.find("#password").val("");
|
this.form.find("#password").val("");
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
this.showWiFiPassword = function() {
|
this.showWiFiPassword = function() {
|
||||||
this.form.find("#passwordLabel").show();
|
this.form.find("#passwordLabel").show();
|
||||||
this.form.find("#password").show();
|
this.form.find("#password").show();
|
||||||
}
|
};
|
||||||
|
|
||||||
this.hideWiFiPassword = function() {
|
this.hideWiFiPassword = function() {
|
||||||
this.form.find("#passwordLabel").hide();
|
this.form.find("#passwordLabel").hide();
|
||||||
this.form.find("#password").hide();
|
this.form.find("#password").hide();
|
||||||
}
|
};
|
||||||
|
|
||||||
this.setClientModeState = function(state,msg) {
|
this.setClientModeState = function(state,msg) {
|
||||||
var field = this.form.find("#clientModeState");
|
var field = this.form.find("#clientModeState");
|
||||||
@ -631,7 +642,8 @@ function SettingsWindow() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
this.clientModeState = state;
|
this.clientModeState = state;
|
||||||
}
|
};
|
||||||
|
|
||||||
this.setAPModeState = function(state,msg) {
|
this.setAPModeState = function(state,msg) {
|
||||||
var field = this.form.find("#apModeState");
|
var field = this.form.find("#apModeState");
|
||||||
var btnCreate = this.form.find("#createAP");
|
var btnCreate = this.form.find("#createAP");
|
||||||
@ -650,7 +662,7 @@ function SettingsWindow() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
this.apModeState = state;
|
this.apModeState = state;
|
||||||
}
|
};
|
||||||
|
|
||||||
this.connectToNetwork = function() {
|
this.connectToNetwork = function() {
|
||||||
console.log("connectToNetwork");
|
console.log("connectToNetwork");
|
||||||
@ -659,7 +671,8 @@ function SettingsWindow() {
|
|||||||
ssid:self.selectedNetwork,
|
ssid:self.selectedNetwork,
|
||||||
phrase:self.form.find("#password").val(),
|
phrase:self.form.find("#password").val(),
|
||||||
recreate:true
|
recreate:true
|
||||||
}
|
};
|
||||||
|
|
||||||
console.log(" postData: ",postData);
|
console.log(" postData: ",postData);
|
||||||
if (communicateWithWifibox) {
|
if (communicateWithWifibox) {
|
||||||
|
|
||||||
@ -687,8 +700,8 @@ function SettingsWindow() {
|
|||||||
// after switching wifi network or creating a access point we delay the status retrieval
|
// after switching wifi network or creating a access point we delay the status retrieval
|
||||||
// because the webserver needs time to switch
|
// because the webserver needs time to switch
|
||||||
clearTimeout(self.retrieveNetworkStatusDelay);
|
clearTimeout(self.retrieveNetworkStatusDelay);
|
||||||
self.retrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(true) },self.retrieveNetworkStatusDelayTime);
|
self.retrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(true); },self.retrieveNetworkStatusDelayTime);
|
||||||
}
|
};
|
||||||
|
|
||||||
this.createAP = function() {
|
this.createAP = function() {
|
||||||
console.log("createAP");
|
console.log("createAP");
|
||||||
@ -717,10 +730,10 @@ function SettingsWindow() {
|
|||||||
// after switching wifi network or creating a access point we delay the status retrieval
|
// after switching wifi network or creating a access point we delay the status retrieval
|
||||||
// because the webserver needs time to switch
|
// because the webserver needs time to switch
|
||||||
clearTimeout(self.retrieveNetworkStatusDelay);
|
clearTimeout(self.retrieveNetworkStatusDelay);
|
||||||
self.retrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(true) },self.retrieveNetworkStatusDelayTime);
|
self.retrieveNetworkStatusDelay = setTimeout(function() { self.retrieveNetworkStatus(true); },self.retrieveNetworkStatusDelayTime);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/*************************
|
/*************************
|
||||||
|
Loading…
Reference in New Issue
Block a user