Merge pull request #116 from rdmtc/dev

1.0.13
rdmtc · Mar 9, 2020 · 57df2a4 · 57df2a4
2 parents abc93a1 + 6073863
commit 57df2a4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,16 @@
 
 #### 1.0.13:  BugFix
 
+- time-inject
+  - fix not visible time input field
+
 - blind-control + clock-time + time-inject + within-time
   - fixed bug where default expire time is not considered #112
   - reduced usage of context for store data
 
+- time-comp / time-span
+  - fixed __after first match__ #115
+
 - general
   - i18N
 

diff --git a/nodes/time-comp.js b/nodes/time-comp.js
@@ -233,7 +233,9 @@ module.exports = function (RED) {
 
                         if (result) {
                             resObj.push(msg);
-                            if (!config.checkall) {
+                            node.debug(i + ' result=' + util.inspect(result, { colors: true, compact: 10, breakLength: Infinity }));
+                            if (config.checkall != 'true') { // eslint-disable-line eqeqeq
+                                node.debug(i + ' end cause checkall');
                                 break;
                             }
                         } else {

diff --git a/nodes/time-inject.html b/nodes/time-inject.html
@@ -1542,7 +1542,7 @@
                     }).change();
                     // #endregion addPayload3
                     $payload.change();
-                    $('#node-input-injectTypeSelect').change(); // also time + property change
+                    $('#node-input-time').change(); // also time + property change
                     $addPayload1.change(); // addPayload2 + addPayload3
                 }; // setup
 
@@ -1680,7 +1680,7 @@
         <span data-i18n="time-inject.label.onceDelay"></span>
     </div>
 
-    <div class="form-row time-inject-row block-noindent is-initial-hidden" id="time-inject-row-timeMain"  data-i18n="[titleOrg]time-inject.placeholder.time">
+    <div class="form-row time-inject-row block-noindent" id="time-inject-row-timeMain"  data-i18n="[titleOrg]time-inject.placeholder.time">
         <label for="node-input-time"><i class="fa fa-clock-o"></i> <span data-i18n="time-inject.label.time"></span></label>
         <input type="text" id="node-input-time" />
         <input type="hidden" id="node-input-timeType">

diff --git a/nodes/time-span.js b/nodes/time-span.js
@@ -410,7 +410,7 @@ module.exports = function (RED) {
                         }
                         if (result) {
                             resObj.push(msg);
-                            if (!config.checkall) {
+                            if (config.checkall != 'true') { // eslint-disable-line eqeqeq
                                 break;
                             }
                         } else {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-sun-position",
-  "version": "1.0.13-beta",
+  "version": "1.0.13",
   "description": "NodeRED nodes to get sun and moon position",
   "keywords": [
     "node-red",