Moving UI strings to javascript

code/espurna/nofuss.ino

@@ -85,7 +85,7 @@ void nofussSetup() {
         	DEBUG_MSG_P(PSTR("         Firmware: %s\n"), (char *) NoFUSSClient.getNewFirmware().c_str());
         	DEBUG_MSG_P(PSTR("         File System: %s\n"), (char *) NoFUSSClient.getNewFileSystem().c_str());
             #if WEB_SUPPORT
-                wsSend_P(PSTR("{\"message\": \"Remote update started\"}"));
+                wsSend_P(PSTR("{\"message\": 1}"));
             #endif
         }
 

code/espurna/ota.ino

@@ -25,7 +25,7 @@ void otaSetup() {
     ArduinoOTA.onStart([]() {
         DEBUG_MSG_P(PSTR("[OTA] Start\n"));
         #if WEB_SUPPORT
-            wsSend_P(PSTR("{\"message\": \"OTA update started\"}"));
+            wsSend_P(PSTR("{\"message\": 2}"));
         #endif
     });
 

code/espurna/web.ino

@@ -73,7 +73,7 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
     JsonObject& root = jsonBuffer.parseObject((char *) payload);
     if (!root.success()) {
         DEBUG_MSG_P(PSTR("[WEBSOCKET] Error parsing data\n"));
-        wsSend_P(client_id, PSTR("{\"message\": \"Error parsing data!\"}"));
+        wsSend_P(client_id, PSTR("{\"message\": 3}"));
         return;
     }
 
@@ -108,7 +108,7 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
 
             JsonObject& data = root["data"];
             if (!data.containsKey("app") || (data["app"] != APP_NAME)) {
-                wsSend_P(client_id, PSTR("{\"message\": \"The file does not look like a valid configuration backup.\"}"));
+                wsSend_P(client_id, PSTR("{\"message\": 4}"));
                 return;
             }
 
@@ -124,7 +124,7 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
 
             saveSettings();
 
-            wsSend_P(client_id, PSTR("{\"message\": \"Changes saved. You should reboot your board now.\"}"));
+            wsSend_P(client_id, PSTR("{\"message\": 5}"));
 
         }
 
@@ -171,7 +171,7 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
                 String value = root["data"];
                 setSetting("haPrefix", value);
                 haSend();
-                wsSend_P(client_id, PSTR("{\"message\": \"Home Assistant auto-discovery message sent.\"}"));
+                wsSend_P(client_id, PSTR("{\"message\": 6}"));
             }
         #endif
 
@@ -289,7 +289,7 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
             }
             if (key == "adminPass2") {
                 if (!value.equals(adminPass)) {
-                    wsSend_P(client_id, PSTR("{\"message\": \"Passwords do not match!\"}"));
+                    wsSend_P(client_id, PSTR("{\"message\": 7}"));
                     return;
                 }
                 if (value.length() == 0) continue;
@@ -396,9 +396,9 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
         }
 
         if (changed) {
-            wsSend_P(client_id, PSTR("{\"message\": \"Changes saved\"}"));
+            wsSend_P(client_id, PSTR("{\"message\": 8}"));
         } else {
-            wsSend_P(client_id, PSTR("{\"message\": \"No changes detected\"}"));
+            wsSend_P(client_id, PSTR("{\"message\": 9}"));
         }
 
     }
@@ -663,7 +663,7 @@ bool _wsAuth(AsyncWebSocketClient * client) {
 
     if (index == WS_BUFFER_SIZE) {
         DEBUG_MSG_P(PSTR("[WEBSOCKET] Validation check failed\n"));
-        wsSend_P(client->id(), PSTR("{\"message\": \"Session expired, please reload page...\"}"));
+        wsSend_P(client->id(), PSTR("{\"message\": 10}"));
         return false;
     }
 

code/html/custom.js

@@ -2,6 +2,8 @@ var websock;
 var password = false;
 var maxNetworks;
 var useWhite = false;
+var messages = [];
+var webhost;
 
 // http://www.the-art-of-web.com/javascript/validate-password/
 function checkPassword(str) {
@@ -90,7 +92,7 @@ function doUpgrade() {
     $.ajax({
 
         // Your server script to process the upload
-        url: window.location.href + 'upgrade',
+        url: webhost + 'upgrade',
         type: 'POST',
 
         // Form data
@@ -165,7 +167,7 @@ function doToggle(element, value) {
 }
 
 function backupSettings() {
-    document.getElementById('downloader').src = window.location.href + 'config';
+    document.getElementById('downloader').src = webhost + 'config';
     return false;
 }
 
@@ -185,7 +187,7 @@ function onFileUpload(event) {
         if (data) {
             websock.send(JSON.stringify({'action': 'restore', 'data': data}));
         } else {
-            alert("The file is not a configuration backup or is corrupted");
+            alert(messages[4]);
         }
     };
     reader.readAsText(inputFile);
@@ -610,7 +612,7 @@ function processData(data) {
 
         // Messages
         if (key == "message") {
-            window.alert(data.message);
+            window.alert(messages[data.message]);
             return;
         }
 
@@ -694,6 +696,7 @@ function connect(host) {
             host = 'http://' + host + '/';
         }
     }
+    webhost = host;
     wshost = host.replace('http', 'ws') + 'ws';
 
     if (websock) websock.close();
@@ -713,8 +716,23 @@ function connect(host) {
     };
 }
 
+function initMessages() {
+    messages[01] = "Remote update started";
+    messages[02] = "OTA update started";
+    messages[03] = "Error parsing data!";
+    messages[04] = "The file does not look like a valid configuration backup or is corrupted";
+    messages[05] = "Changes saved. You should reboot your board now";
+    messages[06] = "Home Assistant auto-discovery message sent";
+    messages[07] = "Passwords do not match!";
+    messages[08] = "Changes saved";
+    messages[09] = "No changes detected";
+    messages[10] = "Session expired, please reload page...";
+}
+
 function init() {
 
+    initMessages();
+
     $("#menuLink").on('click', toggleMenu);
     $(".button-update").on('click', doUpdate);
     $(".button-update-password").on('click', doUpdatePassword);