No reload per default, just send JsonDom

README.md

@@ -1,4 +1,4 @@
-# ESPUI (v2.X)
+# ESPUI
 
 ![ESPUI](https://github.com/s00500/ESPUI/blob/master/docs/ui_complete.png)
 

data/js/controls.js

@@ -232,6 +232,11 @@ function start() {
     var center = "";
     switch (data.type) {
       case UI_INITIAL_GUI:
+        // Clear current elements
+        $("#row").html("");
+        $("#tabsnav").html("");
+        $("#tabscontent").html("");
+
         if (data.sliderContinuous) {
           sliderContinuous = data.sliderContinuous;
         }

data/js/controls.min.js

@@ -7,7 +7,7 @@ function restart(){$(document).add("*").off();$("#row").html("");websock.close()
 function conStatusError(){websockConnected=false;$("#conStatus").removeClass("color-green");$("#conStatus").addClass("color-red");$("#conStatus").html("Error / No Connection ↻");$("#conStatus").off();$("#conStatus").on({click:restart,});}
 function handleVisibilityChange(){if(!websockConnected&&!document.hidden){restart();}}
 function start(){document.addEventListener("visibilitychange",handleVisibilityChange,false);if(window.location.port!=""||window.location.port!=80||window.location.port!=443){websock=new WebSocket("ws://"+window.location.hostname+":"+window.location.port+"/ws");}else{websock=new WebSocket("ws://"+window.location.hostname+"/ws");}
-websock.onopen=function(evt){console.log("websock open");$("#conStatus").addClass("color-green");$("#conStatus").text("Connected");websockConnected=true;};websock.onclose=function(evt){console.log("websock close");conStatusError();};websock.onerror=function(evt){console.log(evt);conStatusError();};var handleEvent=function(evt){var data=JSON.parse(evt.data);var e=document.body;var center="";switch(data.type){case UI_INITIAL_GUI:if(data.sliderContinuous){sliderContinuous=data.sliderContinuous;}
+websock.onopen=function(evt){console.log("websock open");$("#conStatus").addClass("color-green");$("#conStatus").text("Connected");websockConnected=true;};websock.onclose=function(evt){console.log("websock close");conStatusError();};websock.onerror=function(evt){console.log(evt);conStatusError();};var handleEvent=function(evt){var data=JSON.parse(evt.data);var e=document.body;var center="";switch(data.type){case UI_INITIAL_GUI:$("#row").html("");$("#tabsnav").html("");$("#tabscontent").html("");if(data.sliderContinuous){sliderContinuous=data.sliderContinuous;}
 data.controls.forEach(element=>{var fauxEvent={data:JSON.stringify(element),};handleEvent(fauxEvent);});break;case UI_RELOAD:window.location.reload();break;case UI_TITEL:document.title=data.label;$("#mainHeader").html(data.label);break;case UI_LABEL:var parent;if(data.parentControl){parent=$("#tab"+data.parentControl);}else{parent=$("#row");}
 parent.append("<div id='id"+
 data.id+

src/ESPUI.h

@@ -33,7 +33,8 @@
 
 // Message Types (and control types)
 
-enum ControlType : uint8_t {
+enum ControlType : uint8_t
+{
   // fixed controls
   Title = 0,
 
@@ -103,7 +104,18 @@ enum ControlType : uint8_t {
 #define CLEAR_GRAPH ControlType::ClearGraph
 
 // Colors
-enum ControlColor : uint8_t { Turquoise, Emerald, Peterriver, Wetasphalt, Sunflower, Carrot, Alizarin, Dark, None = 0xFF };
+enum ControlColor : uint8_t
+{
+  Turquoise,
+  Emerald,
+  Peterriver,
+  Wetasphalt,
+  Sunflower,
+  Carrot,
+  Alizarin,
+  Dark,
+  None = 0xFF
+};
 #define COLOR_TURQUOISE ControlColor::Turquoise
 #define COLOR_EMERALD ControlColor::Emerald
 #define COLOR_PETERRIVER ControlColor::Peterriver
@@ -114,7 +126,8 @@ enum ControlColor : uint8_t { Turquoise, Emerald, Peterriver, Wetasphalt, Sunflo
 #define COLOR_DARK ControlColor::Dark
 #define COLOR_NONE ControlColor::None
 
-class Control {
+class Control
+{
 public:
   ControlType type;
   uint16_t id; // just mirroring the id here for practical reasons
@@ -129,7 +142,8 @@ public:
 
   Control(ControlType type, const char *label, void (*callback)(Control *, int), String value, ControlColor color,
           uint16_t parentControl = Control::noParent)
-      : type(type), label(label), callback(callback), value(value), color(color), parentControl(parentControl), next(nullptr) {
+      : type(type), label(label), callback(callback), value(value), color(color), parentControl(parentControl), next(nullptr)
+  {
     id = idCounter++;
   }
 
@@ -164,11 +178,18 @@ private:
 #define T_VALUE 10
 #define S_VALUE 11
 
-enum Verbosity : uint8_t { Quiet = 0, Verbose, VerboseJSON };
+enum Verbosity : uint8_t
+{
+  Quiet = 0,
+  Verbose,
+  VerboseJSON
+};
 
-class ESPUIClass {
+class ESPUIClass
+{
 public:
-  ESPUIClass() {
+  ESPUIClass()
+  {
     verbosity = Verbosity::Quiet;
     jsonUpdateDocumentSize = 2000;
     jsonInitialDocumentSize = 8000;
@@ -185,9 +206,8 @@ public:
   void prepareFileSystem(); // Initially preps the filesystem and loads a lot of stuff into SPIFFS
   void list();              // Lists SPIFFS directory
 
-  uint16_t addControl(ControlType type, const char *label, String value = String(""), ControlColor color = ControlColor::Turquoise,
-                      uint16_t parentControl = Control::noParent, void (*callback)(Control *, int) = nullptr);
-  bool remControl(uint16_t id, bool reload_ui = true);
+  uint16_t addControl(ControlType type, const char *label, String value = String(""), ControlColor color = ControlColor::Turquoise, uint16_t parentControl = Control::noParent, void (*callback)(Control *, int) = nullptr);
+  bool removeControl(uint16_t id, bool force_reload_ui = false);
 
   // create Elements
   uint16_t button(const char *label, void (*callback)(Control *, int), ControlColor color, String value = "");         // Create Event Button
@@ -204,8 +224,7 @@ public:
   // Output only
   uint16_t label(const char *label, ControlColor color, String value = "");                     // Create Label
   uint16_t graph(const char *label, ControlColor color);                                        // Create Graph display
-  uint16_t gauge(const char *label, ControlColor color, int value, int min = 0,
-                 int max = 100); // Create Gauge display
+  uint16_t gauge(const char *label, ControlColor color, int value, int min = 0, int max = 100); // Create Gauge display
 
   // Input only
   uint16_t accelerometer(const char *label, void (*callback)(Control *, int), ControlColor color);
@@ -221,8 +240,6 @@ public:
   void updateControl(uint16_t id, int clientId = -1);
   void updateControl(Control *control, int clientId = -1);
 
-  void reload();
-
   void print(uint16_t id, String value);
   void updateLabel(uint16_t id, String value);
   void updateSwitcher(uint16_t id, bool nValue, int clientId = -1);
@@ -238,8 +255,8 @@ public:
   // Variables
   const char *ui_title = "ESPUI"; // Store UI Title and Header Name
   Control *controls = nullptr;
+  void jsonReload();
   void jsonDom(AsyncWebSocketClient *client);
-  void jsonReload(AsyncWebSocketClient *client);
 
   Verbosity verbosity;