Merge pull request #1166 from BorcheM/v2.2

Show spaces SSID and password in settings in web interface

utils/web_converter/webConverter.py

@@ -222,7 +222,7 @@ f.write("#endif\n")
 f.write("\n")
 f.write("void copyWebFiles(bool force){\n")
 f.write("#ifdef USE_PROGMEM_WEB_FILES\n")
-f.write("if(settings.getWebSpiffs()){\n")
+f.write("if(settings.getWebSettings().use_spiffs){\n")
 f.write(copy_files_function)
 f.write("}\n")
 f.write("#endif\n")

web_interface/js/settings.js

@@ -23,7 +23,7 @@ function draw(){
 			}else if(typeof settingsJson[key] == "number"){
 				html += "<input type='number' name='"+key+"' value="+settingsJson[key]+" onchange='save(\""+key+"\",parseInt(this.value))'>";
 			}else if(typeof settingsJson[key] == "string"){
-				html += "<input type='text' name='"+key+"' value="+settingsJson[key]+" "+(key=="version"?"readonly":"")+" onchange='save(\""+key+"\",this.value)'>";
+				html += "<input type='text' name='"+key+"' value='"+settingsJson[key].toString()+"' "+(key=="version"?"readonly":"")+" onchange='save(\""+key+"\",this.value)'>";
 			}
 			
 			html += "</div>"