Merge branch 'Enhance/v099' into master

mkdocs/faq.md

@@ -27,7 +27,7 @@ ESP32 hardware equips only one RF circuitry for WiFi signal. At the AP_STA mode,
 
 ## <i class="fa fa-question-circle"></i> Does not appear esp8266ap in smartphone.
 
-Maybe it is successfully connected at the **first WiFi.begin**. ESP8266 remembers the last SSID successfully connected and will use at the next. It means SoftAP will only start up when the first *WiFi.begin()* fails.
+Maybe it is successfully connected at the [**first WiFi.begin**](lsbegin.md#autoconnectbegin-logic-sequence). ESP8266 remembers the last SSID successfully connected and will use at the next. It means SoftAP will only start up when the first *WiFi.begin()* fails.
 
 The saved SSID would be cleared by  *WiFi.disconnect()* with WIFI_STA mode. If you do not want automatic reconnection, you can erase the memorized SSID with the following simple sketch.
 

src/AutoConnectElementBasis.h

@@ -46,11 +46,11 @@ typedef enum {
  */
 class AutoConnectElementBasis {
  public:
-  explicit AutoConnectElementBasis(const char* name = "", const char* value = "") : name(String(name)), value(String(value)) {
+  explicit AutoConnectElementBasis(const char* name = "", const char* value = "") : name(String(name)), value(String(value)), enable(true) {
     _type = AC_Element;
   }
   virtual ~AutoConnectElementBasis() {}
-  virtual const String  toHTML(void) const { return value; }
+  virtual const String  toHTML(void) const { return enable ? value : String(""); }
   ACElement_t typeOf(void) const { return _type; }
 #ifndef AUTOCONNECT_USE_JSON
   template<typename T>
@@ -59,6 +59,7 @@ class AutoConnectElementBasis {
 
   String  name;       /**< Element name */
   String  value;      /**< Element value */
+  bool    enable;     /**< Enabling the element */
 
  protected:
   ACElement_t _type;  /**< Element type identifier */

src/AutoConnectElementBasisImpl.h

@@ -25,7 +25,7 @@
  * @return  An HTML string.
  */
 const String AutoConnectButtonBasis::toHTML(void) const {
-  return String(F("<button type=\"button\" name=\"")) + name + String(F("\" value=\"")) + value + String(F("\" onclick=\"")) + action + String("\">") + value + String(F("</button>"));
+  return enable ? String(F("<button type=\"button\" name=\"")) + name + String(F("\" value=\"")) + value + String(F("\" onclick=\"")) + action + String("\">") + value + String(F("</button>")) : String("");
 }
 
 /**
@@ -37,14 +37,16 @@ const String AutoConnectButtonBasis::toHTML(void) const {
  * @return  An HTML string.
  */
 const String AutoConnectCheckboxBasis::toHTML(void) const {
-  String  html;
+  String  html = String("");
 
+  if (enable) {
     html = String(F("<input type=\"checkbox\" name=\"")) + name + String(F("\" value=\"")) + value + String("\"");
     if (checked)
       html += String(F(" checked"));
     if (label.length())
       html += String(F(" id=\"")) + name + String(F("\"><label for=\"")) + name + String("\">") + label + String(F("</label"));
     html += String(F("><br>"));
+  }
   return html;
 }
 
@@ -58,9 +60,11 @@ const String AutoConnectCheckboxBasis::toHTML(void) const {
 const String AutoConnectFileBasis::toHTML(void) const {
   String  html = String("");
 
+  if (enable) {
     if (label.length())
       html = String(F("<label for=\"")) + name + String(F("\">")) + label + String(F("</label>"));
     html += String(F("<input type=\"file\" id=\"")) + name + String(F("\" name=\"")) + name + String(F("\"><br>"));
+  }
   return html;
 }
 
@@ -101,6 +105,7 @@ bool AutoConnectFileBasis::attach(const ACFile_t store) {
 const String AutoConnectInputBasis::toHTML(void) const {
   String  html = String("");
 
+  if (enable) {
     if (label.length())
       html = String(F("<label for=\"")) + name + String("\">") + label + String(F("</label>"));
     html += String(F("<input type=\"text\" id=\"")) + name + String(F("\" name=\"")) + name + String("\"");
@@ -111,7 +116,7 @@ const String AutoConnectInputBasis::toHTML(void) const {
     if (value.length())
       html += String(F(" value=\"")) + value + String("\"");
     html += String(F("><br>"));
-
+  }
   return html;
 }
 
@@ -269,7 +274,7 @@ const String& AutoConnectSelectBasis::value(void) const {
  * @return String  an HTML string.
  */
 const String AutoConnectSubmitBasis::toHTML(void) const {
-  return String(F("<input type=\"button\" name=\"")) + name + String(F("\" value=\"")) + value + String(F("\" onclick=\"_sa('")) + uri + String("')\">");
+  return enable ? String(F("<input type=\"button\" name=\"")) + name + String(F("\" value=\"")) + value + String(F("\" onclick=\"_sa('")) + uri + String("')\">") : String("");
 }
 
 /**
@@ -278,7 +283,10 @@ const String AutoConnectSubmitBasis::toHTML(void) const {
  * @return String  an HTML string.
  */
 const String AutoConnectTextBasis::toHTML(void) const {
-  String  html = String("<div");
+  String  html = String("");
+
+  if (enable) {
+    html = String("<div");
     String  value_f = value;
 
     if (style.length())
@@ -294,6 +302,7 @@ const String AutoConnectTextBasis::toHTML(void) const {
       }
     }
     html += value_f + String(F("</div>"));
+  }
   return html;
 }