Merge remote-tracking branch 'Grovkillen/master'

# Conflicts:
#	Gruntfile.js
#	build/0.1.nightly.3/info/package.json
#	build/0.1.nightly.3/info/release.txt
#	build/0.1.nightly.3/info/source_files.json
#	build/0.1.nightly.3/main/index.htm.gz
#	build/0.1.nightly.3/mini/index.htm.gz
#	build/0.1.nightly.3/noDash/index.htm.gz
#	build/0.1.nightly.3/src-0.1.nightly.3.zip
#	package.json
#	src/index-minimal.html
#	src/index-minimal.js

README.md

@@ -340,7 +340,9 @@ A release cycle exemplified:
 ``1.0.0``  <--- release
 
 ``1.0.nightly.1``  <--- working on a fix or a new major/minor release
+
 ...
+
 ``1.0.nightly.123``  <--- we decide that this one will be next 1.1.0
 
 ``1.0.rc1.124``  <--- here's the release candidate (1.0.nightly.123 code base)
@@ -379,10 +381,13 @@ grunt bump:dev=true
 grunt bump:dev=false
 >> 0.0.nightly.2 --> 0.0.2
 >> 0.0.rc1.3 --> 0.0.3     <--- this one isn't correct
+
+grunt bump                 <--- will return current version
+>> 0.0.nightly.2
 ```
 
-As seen in the last example, if you have a release candidate number assigned when you set the
-development flag to true it will still have that rc number. That being said, you should only
+As seen in the second to last example, if you have a release candidate number assigned when you set
+the development flag to true it will still have that rc number. That being said, you should only
 use the dev=BOOL to quickly set the version handler to development mode if you by some chance 
 made a mistake when you bumped. The workflow is like this.
 
@@ -395,16 +400,31 @@ ready.
 Release candidates are by definition never set to the future major and/or minor level. See this example:
 
 ```
-1.0.0 is released and we want to create a new version with extra stuff
+1.0.0 is already released and we want to create a new version with extra stuff
 1.0.nightly.1 is created and we start adding the stuff
 ...
 1.0.nightly.123 is ready to be tested by a broader user base
 1.0.rc1.124 is created
 ...
-1.0.rc3.124 is the version that is finally accepted
+1.0.rc3.126 is the version that is finally accepted
 1.1.0 is created and released.
 ```
 
+Another example
+
+```
+1.1.0 is already released but we found a bug that cannot wait for next version to be resolved
+1.1.nightly.1 is created and we start fixing the bug
+...
+1.1.nightly.5 is ready to be tested by a broader user base
+1.1.rc1.6 is created and after testing accepted
+1.1.7 is created and released.
+```
+
+As you can see, ``nightly`` and ``rc`` is **only a state** of the code, the revision is still
+the actual version together with the major and minor number. You may be used to the term
+metadata or tag, anyway, they are not used as actual versions.
+
 ## CSS Framework
 
 The entire CSS framework can be used for any other web site or project but currently we haven't

build/0.0.nightly.1/info/warning.txt

@@ -0,0 +1 @@
+This version is development only, do not use!

build/0.0.nightly.2/info/warning.txt

@@ -0,0 +1 @@
+This version is development only, do not use!

build/0.0.nightly.3/info/warning.txt

@@ -0,0 +1 @@
+This version is development only, do not use!

build/0.0.nightly.5/info/warning.txt

@@ -0,0 +1 @@
+This version is development only, do not use!

build/0.0.rc1.6/info/warning.txt

@@ -0,0 +1 @@
+This version is development only, do not use!

build/0.1.0/info/warning.txt

@@ -0,0 +1 @@
+This version is development only, do not use!

src/forms/gui_easy_forms.js

@@ -13,40 +13,13 @@ guiEasy.forms.setupForm = function (type) {
     container.innerHTML = html;
 };
 
-guiEasy.forms.regEx = function(string) {
-    guiEasy.syntax.curlyLC++;
-    const regExp = /(?:{{)([^}]{1,256})(?:}})/g;  //THIS MEANS THAT A FORM CURLY CAN BE 256 CHARS LONG = longer than regular curly...
-    let curlyMatches = [];
-    let match;
-    while (match = regExp.exec(string)) {
-        curlyMatches.push([match[1], match[0]]);  // [0] is always the full match..;
-    }
-    for (let i = 0; i < curlyMatches.length; i++) {
-        let curly = guiEasy.curly.compileArgs(curlyMatches[i][0].split("--"));
-        let curlyReplace = curlyMatches[i][1].replace(/}/g, "\\}");
-        curlyReplace = curlyReplace.replace(/{/g, "\\{");
-        curlyReplace = curlyReplace.replace(/\(/g, "\\(");
-        curlyReplace = curlyReplace.replace(/\)/g, "\\)");
-        curlyReplace = curlyReplace.replace(/\|/g, "\\|");
-        curlyReplace = RegExp(curlyReplace);
-        curlyMatches[i] = {"type": curly[0], "replace": curlyReplace, "noArgs": curly[1], "args": curly[2]};
-    }
-    for (let i = 0; i < curlyMatches.length; i++) {
-        curlyMatches[i].replaceWith = guiEasy.curly.forms(curlyMatches[i]);
-        string = string.replace(curlyMatches[i]["replace"], curlyMatches[i]["replaceWith"]);
-    }
-    string = string.replace(/"/g, "'");
-    return string;
-};
-
 guiEasy.forms.plugin = function (number) {
     let start = guiEasy.forms.plugin.start();
     let end = guiEasy.forms.plugin.end();
     let middle = guiEasy.forms.plugin["P" + ("000" + number).slice(-3)];
     if (middle === undefined) {
         return null;
     }
-    middle = guiEasy.forms.regEx(middle.html);
     return start + middle + end;
 };
 
@@ -57,7 +30,6 @@ guiEasy.forms.controller = function (number) {
     if (middle === undefined) {
         return null;
     }
-    middle = guiEasy.forms.regEx(middle.html);
     return start + middle + end;
 };
 
@@ -68,7 +40,6 @@ guiEasy.forms.notification = function (number) {
     if (middle === undefined) {
         return null;
     }
-    middle = guiEasy.forms.regEx(middle.html);
     return start + middle + end;
 };
 

src/forms/gui_easy_forms_c005.js

@@ -6,31 +6,6 @@ guiEasy.forms.controller.C005.category = "mqtt";
 guiEasy.forms.controller.C005.state = "normal"; //normal, testing, development
 //------------------------------- HTML or CURLY -------------------------------//
 guiEasy.forms.controller.C005.html = `
-{{IPorHOST--IP--C005-1--ip or hostname}}
-{{IPorHOST--PORT--C005-2--C005-1--controller port}}
-<hr>
-{{IPorHOST--INTERVAL--C005-3--C005-1--minimum send interval}}
-{{IPorHOST--QUE--C005-4--C005-1--max in que}}
-{{IPorHOST--TRIES--C005-5--C005-1--max send tries}}
-{{IPorHOST--QUE_ACTION--C005-6--C005-1--if full que, ignore new|if full que, delete oldest}}
-{{IPorHOST--ACKNOWLEDGE--C005-7--C005-1--wait for ok when send|send and forget}}
-<div id="c005-1-HOST" class="is-hidden">
-{{STRING--settings-hostname--C005-1-HOST--controller hostname}}
-{{NUMBER--settings-port--C005-2-HOST--controller port--0}}
-{{NUMBER--settings-X--C005-3-HOST--minimum send interval--100}}
-{{NUMBER--settings-X--C005-4-HOST--max in que--10}}
-{{NUMBER--settings-X--C005-5-HOST--max send tries--10}}
-{{TOGGLE--settings-X--C005-6-HOST--if full que, ignore new|if full que, delete oldest}}
-{{TOGGLE--settings-X--C005-7-HOST--wait for ok when send|send and forget}}
-</div>
-<div id="c005-1-IP" class="is-hidden">
-{{STRING--extra-ip--C005-1-IP--controller ip}}
-{{NUMBER--extra-port--C005-2-IP--controller port--0}}
-{{NUMBER--extra-X--C005-3-IP--minimum send interval--100}}
-{{NUMBER--extra-X--C005-4-IP--max in que--10}}
-{{NUMBER--extra-X--C005-5-IP--max send tries--10}}
-{{TOGGLE--extra-X--C005-6-IP--if full que, ignore new|if full que, delete oldest}}
-{{TOGGLE--extra-X--C005-7-IP--wait for ok when send|send and forget}}
-</div>
+Add html or curly syntax here...
 `;  //--------------------------- HTML or CURLY -------------------------------//
 

src/gui_easy_pitcher.js

@@ -5,6 +5,7 @@ guiEasy.pitcher = async function (processID, processType) {
     let urlParams = helpEasy.urlParams();
     helpEasy.getGuiInFields();
     helpEasy.setCurrentIndex(-1);
+    //TODO: remove this part when doing a build release (saves almost 1kB)
     if (window.location.hostname === "localhost") {
         let path = window.location.origin + window.location.pathname;
         path = path.replace("index.html", "custom.json");

src/gui_easy_popper_extra.js

@@ -1,9 +1,17 @@
 /* GUIEasy  Copyright (C) 2019-2020  Jimmy "Grovkillen" Westberg */
-
-guiEasy.popper.extra = "";
+guiEasy.popper.tier = {
+    "level": 0,
+    "timestamp": null,
+    "tier1": 1,
+    "tier2": 2,
+    "tier3": 3,
+    "tier4": 4,
+    "tier5": 5
+};
 
 guiEasy.popper.modal.unlockStuff = function () {
-    if (guiEasy.popper.extra !== undefined) {
+    let t = guiEasy.popper.tier;
+    if (t.level >= t.tier1) {
         document.getElementById("drawer-theme").classList.remove("is-hidden");
     }
 };

src/index.html

@@ -19,7 +19,6 @@
     <script src="gui_easy_curly_unit.js"></script>
     <script src="gui_easy_curly_page.js"></script>
     <script src="gui_easy_curly_icons.js"></script>
-    <script src="gui_easy_curly_forms.js"></script>
     <script src="gui_easy_scrubber.js"></script>
     <script src="gui_easy_popper.js"></script>
     <script src="gui_easy_popper_extra.js"></script>