remove color dark, version bump

2019-02-26 16:04:41 +01:00 · 2019-02-26 16:04:41 +01:00 · 2fae44f387
parent 4f421c84d5
commit 2fae44f387
6 changed files with 151 additions and 152 deletions
--- a/examples/gui/data/js/controls.js
+++ b/examples/gui/data/js/controls.js
@ -67,10 +67,7 @@ function colorClass(colorId) {
      return "alizarin";

    case C_NONE:
-      return "";
-    case C_DARK:
      return "dark";
-
    default:
      return "";
  }
@ -108,24 +105,24 @@ function handleVisibilityChange() {
 function start() {
  document.addEventListener("visibilitychange", handleVisibilityChange, false);
  websock = new WebSocket("ws://" + window.location.hostname + "/ws");
-  websock.onopen = function (evt) {
+  websock.onopen = function(evt) {
    console.log("websock open");
    $("#conStatus").addClass("color-green");
    $("#conStatus").text("Connected");
    websockConnected = true;
  };

-  websock.onclose = function (evt) {
+  websock.onclose = function(evt) {
    console.log("websock close");
    conStatusError();
  };

-  websock.onerror = function (evt) {
+  websock.onerror = function(evt) {
    console.log(evt);
    conStatusError();
  };

-  var handleEvent = function (evt) {
+  var handleEvent = function(evt) {
    //console.log(evt);
    var data = JSON.parse(evt.data);
    var e = document.body;
@ -146,42 +143,42 @@ function start() {
      case UI_LABEL:
        $("#row").append(
          "<div class='two columns card tcenter " +
-          colorClass(data.color) +
-          "'><h5 id='" +
-          data.id +
-          "'>" +
-          data.label +
-          "</h5><hr /><span id='l" +
-          data.id +
-          "' class='label label-wrap'>" +
-          data.value +
-          "</span></div>"
+            colorClass(data.color) +
+            "'><h5 id='" +
+            data.id +
+            "'>" +
+            data.label +
+            "</h5><hr /><span id='l" +
+            data.id +
+            "' class='label label-wrap'>" +
+            data.value +
+            "</span></div>"
        );
        break;
      case UI_BUTTON:
        $("#row").append(
          "<div class='one columns card tcenter " +
-          colorClass(data.color) +
-          "'><h5>" +
-          data.label +
-          "</h5><hr/><button onmousedown='buttonclick(" +
-          data.id +
-          ", true)' onmouseup='buttonclick(" +
-          data.id +
-          ", false)' id='" +
-          data.id +
-          "'>" +
-          data.value +
-          "</button></div>"
+            colorClass(data.color) +
+            "'><h5>" +
+            data.label +
+            "</h5><hr/><button onmousedown='buttonclick(" +
+            data.id +
+            ", true)' onmouseup='buttonclick(" +
+            data.id +
+            ", false)' id='" +
+            data.id +
+            "'>" +
+            data.value +
+            "</button></div>"
        );
        $("#" + data.id).on({
-          touchstart: function (e) {
+          touchstart: function(e) {
            e.preventDefault();
            buttonclick(data.id, true);
          }
        });
        $("#" + data.id).on({
-          touchend: function (e) {
+          touchend: function(e) {
            e.preventDefault();
            buttonclick(data.id, false);
          }
@ -206,16 +203,16 @@ function start() {
        }
        $("#row").append(
          "<div id='" +
-          data.id +
-          "' class='one columns card tcenter " +
-          colorClass(data.color) +
-          "'><h5>" +
-          data.label +
-          "</h5><hr/>" +
-          label +
-          input +
-          "</label>" +
-          "</div>"
+            data.id +
+            "' class='one columns card tcenter " +
+            colorClass(data.color) +
+            "'><h5>" +
+            data.label +
+            "</h5><hr/>" +
+            label +
+            input +
+            "</label>" +
+            "</div>"
        );
        break;
      case UI_CPAD:
@ -227,106 +224,106 @@ function start() {
          ", false)' href='#' id='pc" +
          data.id +
          "'>OK</a>";
-        //NO BREAK
+      //NO BREAK
      case UI_PAD:
        $("#row").append(
          "<div class='two columns card tcenter " +
-          colorClass(data.color) +
-          "'><h5>" +
-          data.label +
-          "</h5><hr/>" +
-          "<nav class='control'>" +
-          "<ul>" +
-          "<li><a onmousedown='padclick(FOR, " +
-          data.id +
-          ", true)' onmouseup='padclick(FOR, " +
-          data.id +
-          ", false)' href='#' id='pf" +
-          data.id +
-          "'>▲</a></li>" +
-          "<li><a onmousedown='padclick(RIGHT, " +
-          data.id +
-          ", true)' onmouseup='padclick(RIGHT, " +
-          data.id +
-          ", false)' href='#' id='pr" +
-          data.id +
-          "'>▲</a></li>" +
-          "<li><a onmousedown='padclick(LEFT, " +
-          data.id +
-          ", true)' onmouseup='padclick(LEFT, " +
-          data.id +
-          ", false)' href='#' id='pl" +
-          data.id +
-          "'>▲</a></li>" +
-          "<li><a onmousedown='padclick(BACK, " +
-          data.id +
-          ", true)' onmouseup='padclick(BACK, " +
-          data.id +
-          ", false)' href='#' id='pb" +
-          data.id +
-          "'>▲</a></li>" +
-          "</ul>" +
-          center +
-          "</nav>" +
-          "</div>"
+            colorClass(data.color) +
+            "'><h5>" +
+            data.label +
+            "</h5><hr/>" +
+            "<nav class='control'>" +
+            "<ul>" +
+            "<li><a onmousedown='padclick(FOR, " +
+            data.id +
+            ", true)' onmouseup='padclick(FOR, " +
+            data.id +
+            ", false)' href='#' id='pf" +
+            data.id +
+            "'>▲</a></li>" +
+            "<li><a onmousedown='padclick(RIGHT, " +
+            data.id +
+            ", true)' onmouseup='padclick(RIGHT, " +
+            data.id +
+            ", false)' href='#' id='pr" +
+            data.id +
+            "'>▲</a></li>" +
+            "<li><a onmousedown='padclick(LEFT, " +
+            data.id +
+            ", true)' onmouseup='padclick(LEFT, " +
+            data.id +
+            ", false)' href='#' id='pl" +
+            data.id +
+            "'>▲</a></li>" +
+            "<li><a onmousedown='padclick(BACK, " +
+            data.id +
+            ", true)' onmouseup='padclick(BACK, " +
+            data.id +
+            ", false)' href='#' id='pb" +
+            data.id +
+            "'>▲</a></li>" +
+            "</ul>" +
+            center +
+            "</nav>" +
+            "</div>"
        );

        $("#pf" + data.id).on({
-          touchstart: function (e) {
+          touchstart: function(e) {
            e.preventDefault();
            padclick(FOR, data.id, true);
          }
        });
        $("#pf" + data.id).on({
-          touchend: function (e) {
+          touchend: function(e) {
            e.preventDefault();
            padclick(FOR, data.id, false);
          }
        });
        $("#pl" + data.id).on({
-          touchstart: function (e) {
+          touchstart: function(e) {
            e.preventDefault();
            padclick(LEFT, data.id, true);
          }
        });
        $("#pl" + data.id).on({
-          touchend: function (e) {
+          touchend: function(e) {
            e.preventDefault();
            padclick(LEFT, data.id, false);
          }
        });
        $("#pr" + data.id).on({
-          touchstart: function (e) {
+          touchstart: function(e) {
            e.preventDefault();
            padclick(RIGHT, data.id, true);
          }
        });
        $("#pr" + data.id).on({
-          touchend: function (e) {
+          touchend: function(e) {
            e.preventDefault();
            padclick(RIGHT, data.id, false);
          }
        });
        $("#pb" + data.id).on({
-          touchstart: function (e) {
+          touchstart: function(e) {
            e.preventDefault();
            padclick(BACK, data.id, true);
          }
        });
        $("#pb" + data.id).on({
-          touchend: function (e) {
+          touchend: function(e) {
            e.preventDefault();
            padclick(BACK, data.id, false);
          }
        });
        $("#pc" + data.id).on({
-          touchstart: function (e) {
+          touchstart: function(e) {
            e.preventDefault();
            padclick(CENTER, data.id, true);
          }
        });
        $("#pc" + data.id).on({
-          touchend: function (e) {
+          touchend: function(e) {
            e.preventDefault();
            padclick(CENTER, data.id, false);
          }
@ -343,23 +340,23 @@ function start() {
      case UI_SLIDER:
        $("#row").append(
          "<div class='two columns card tcenter card-slider " +
-          colorClass(data.color) +
-          "'>" +
-          "<h5 id='" +
-          data.id +
-          "'>" +
-          data.label +
-          "</h5><hr />" +
-          "<div id='sl" +
-          data.id +
-          "' class='rkmd-slider slider-discrete slider-" +
-          colorClass(data.color) +
-          "'>" +
-          "<input type='range' min='0' max='100' value='" +
-          data.value +
-          "'>" +
-          "</div>" +
-          "</div>"
+            colorClass(data.color) +
+            "'>" +
+            "<h5 id='" +
+            data.id +
+            "'>" +
+            data.label +
+            "</h5><hr />" +
+            "<div id='sl" +
+            data.id +
+            "' class='rkmd-slider slider-discrete slider-" +
+            colorClass(data.color) +
+            "'>" +
+            "<input type='range' min='0' max='100' value='" +
+            data.value +
+            "'>" +
+            "</div>" +
+            "</div>"
        );
        $("#row").append(
          "<script>" + "rkmd_rangeSlider('#sl" + data.id + "');" + "</script>"
@ -373,21 +370,21 @@ function start() {
      case UI_NUMBER:
        $("#row").append(
          "<div class='two columns card tcenter " +
-          colorClass(data.color) +
-          "'>" +
-          "<h5 id='" +
-          data.id +
-          "'>" +
-          data.label +
-          "</h5><hr />" +
-          "<input style='color:black;' id='num" +
-          data.id +
-          "' type='number' value='" +
-          data.value +
-          "' onchange='numberchange(" +
-          data.id +
-          ")' />" +
-          "</div>"
+            colorClass(data.color) +
+            "'>" +
+            "<h5 id='" +
+            data.id +
+            "'>" +
+            data.label +
+            "</h5><hr />" +
+            "<input style='color:black;' id='num" +
+            data.id +
+            "' type='number' value='" +
+            data.value +
+            "' onchange='numberchange(" +
+            data.id +
+            ")' />" +
+            "</div>"
        );
        break;

@ -398,21 +395,21 @@ function start() {
      case UI_TEXT_INPUT:
        $("#row").append(
          "<div class='two columns card tcenter " +
-          colorClass(data.color) +
-          "'>" +
-          "<h5 id='" +
-          data.id +
-          "'>" +
-          data.label +
-          "</h5><hr />" +
-          "<input style='color:black;' id='text" +
-          data.id +
-          "' value='" +
-          data.value +
-          "' onchange='textchange(" +
-          data.id +
-          ")' />" +
-          "</div>"
+            colorClass(data.color) +
+            "'>" +
+            "<h5 id='" +
+            data.id +
+            "'>" +
+            data.label +
+            "</h5><hr />" +
+            "<input style='color:black;' id='text" +
+            data.id +
+            "' value='" +
+            data.value +
+            "' onchange='textchange(" +
+            data.id +
+            ")' />" +
+            "</div>"
        );
        break;

@ -487,4 +484,4 @@ function switcher(number, state) {
    $("#sl" + number).removeClass("checked");
    $("#sl" + number).prop("checked", false);
  }
-}
+}
--- a/examples/gui/data/js/controls.min.js
+++ b/examples/gui/data/js/controls.min.js
@ -1,4 +1,4 @@
-const UI_INITIAL_GUI=100;const UI_TITEL=0;const UI_LABEL=1;const UPDATE_LABEL=6;const UI_BUTTON=2;const UI_SWITCHER=3;const UPDATE_SWITCHER=7;const UI_PAD=4;const UI_CPAD=5;const UI_SLIDER=8;const UPDATE_SLIDER=9;const UI_NUMBER=10;const UPDATE_NUMBER=11;const UI_TEXT_INPUT=12;const UPDATE_TEXT_INPUT=13;const UI_GRAPH=14;const CLEAR_GRAPH=15;const ADD_GRAPH_POINT=16;const FOR=0;const BACK=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_NONE=7;const C_DARK=8;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";case C_EMERALD:return"emerald";case C_PETERRIVER:return"peterriver";case C_WETASPHALT:return"wetasphalt";case C_SUNFLOWER:return"sunflower";case C_CARROT:return"carrot";case C_ALIZARIN:return"alizarin";case C_NONE:return"";case C_DARK:return"dark";default:return"";}}
+const UI_INITIAL_GUI=100;const UI_TITEL=0;const UI_LABEL=1;const UPDATE_LABEL=6;const UI_BUTTON=2;const UI_SWITCHER=3;const UPDATE_SWITCHER=7;const UI_PAD=4;const UI_CPAD=5;const UI_SLIDER=8;const UPDATE_SLIDER=9;const UI_NUMBER=10;const UPDATE_NUMBER=11;const UI_TEXT_INPUT=12;const UPDATE_TEXT_INPUT=13;const UI_GRAPH=14;const CLEAR_GRAPH=15;const ADD_GRAPH_POINT=16;const FOR=0;const BACK=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_NONE=7;const C_DARK=8;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";case C_EMERALD:return"emerald";case C_PETERRIVER:return"peterriver";case C_WETASPHALT:return"wetasphalt";case C_SUNFLOWER:return"sunflower";case C_CARROT:return"carrot";case C_ALIZARIN:return"alizarin";case C_NONE:return"dark";default:return"";}}
 var websock;var websockConnected=false;function restart(){$(document).add("*").off();$("#row").html("");websock.close();start();}
 function conStatusError(){websockConnected=false;$("#conStatus").removeClass("color-green");$("#conStatus").addClass("color-red");$("#conStatus").html("Error / No Connection &#8635;");$("#conStatus").off();$("#conStatus").on({click:restart});}
 function handleVisibilityChange(){if(!websockConnected&&!document.hidden){restart();}}
--- a/library.json
+++ b/library.json
@ -6,13 +6,16 @@
    "type": "git",
    "url": "https://github.com/s00500/ESPUI.git"
  },
-  "authors": [{
-    "name": "Lukas Bachschwell",
-    "email": "lukas@lbsfilm.at",
-    "url": "https://lbsfilm.at",
-    "maintainer": true
-  }],
-  "dependencies": [{
+  "authors": [
+    {
+      "name": "Lukas Bachschwell",
+      "email": "lukas@lbsfilm.at",
+      "url": "https://lbsfilm.at",
+      "maintainer": true
+    }
+  ],
+  "dependencies": [
+    {
      "name": "ESP Async WebServer",
      "authors": "Hristo Gochkov",
      "frameworks": "arduino"
@ -23,7 +26,7 @@
      "frameworks": "arduino"
    }
  ],
-  "version": "1.6.1",
+  "version": "1.6.2",
  "frameworks": "arduino",
  "platforms": "*"
-}
+}
--- a/library.properties
+++ b/library.properties
@ -1,5 +1,5 @@
 name=ESPUI
-version=1.6.1
+version=1.6.2
 author=Lukas Bachschwell
 maintainer=Lukas Bachschwell <lukas@lbsfilm.at>
 sentence=ESP32 and ESP8266 Web Interface Library
--- a/src/ESPUI.h
+++ b/src/ESPUI.h
@ -99,7 +99,6 @@ typedef struct Control {
 #define COLOR_CARROT 5
 #define COLOR_ALIZARIN 6
 #define COLOR_NONE 7
-#define COLOR_DARK 8

 class ESPUIClass {
 public:
--- a/src/dataControlsJS.h
+++ b/src/dataControlsJS.h