@node-red/nodes 4.1.7 → 4.1.8

package/core/function/10-function.html

@@ -351,6 +351,27 @@
         return _libs;
     }
 
+    function getEditorValue(editor, defaultValue) {
+        var val = editor.getValue();
+        if (defaultValue && val.trim() === defaultValue.trim()) {
+            return "";
+        } else {
+            return val;
+        }
+    }
+
+    function getEditorErrorCount(editor) {
+        const annot = editor.getSession().getAnnotations();
+        let count = 0
+        for (var k=0; k < annot.length; k++) {
+            if (annot[k].type === "error") {
+                count += annot.length;
+                break;
+            }
+        }
+        return count
+    }
+
     RED.nodes.registerType('function',{
         color:"#fdd0a2",
         category: 'function',
@@ -427,6 +448,7 @@
                         } else if (that.finalizeEditor.getDomNode() == editor[0]) {
                             that.finalizeEditor.focus();
                         }
+                        updateTabBadges();
                     }
                 }
             });
@@ -451,6 +473,28 @@
 
             tabs.activateTab("func-tab-body");
 
+
+            const updateTabBadge = (tabId, editorName, defaultValue) => {
+                const editor = this[editorName]
+                const hasContent = getEditorValue(editor, defaultValue) !== ''
+                // This doesn't work as the annotations appear to be cleared when the editor isn't active
+                // TODO: add a badge for tabs with errors
+                // const hasErrors = getEditorErrorCount(editor) > 0
+                const badgeSpan = $(`#red-ui-tab-${tabId} .red-ui-tabs-badges`)
+                badgeSpan.find('i').remove()
+                $(`#red-ui-tab-${tabId} .red-ui-tabs-badges i`).remove()
+                if (hasContent) {
+                    $('<i style="display: inline" class="fa fa-file-code-o"></i>').appendTo(badgeSpan)
+                }
+                                
+            }
+            
+            const updateTabBadges = function () {
+                updateTabBadge("func-tab-body", "editor", "")
+                updateTabBadge("func-tab-init", "initEditor", RED._("node-red:function.text.initialize"))
+                updateTabBadge("func-tab-finalize", "finalizeEditor", RED._("node-red:function.text.finalize"))
+            }
+            
             $( "#node-input-outputs" ).spinner({
                 min: 0,
                 max: 500,
@@ -593,27 +637,18 @@
             if (RED.settings.functionExternalModules !== false) {
                 prepareLibraryConfig(that);
             }
+
+            updateTabBadges();
         },
         oneditsave: function() {
-            var node = this;
-            var noerr = 0;
+            const node = this;
+            let noerr = 0;
             $("#node-input-noerr").val(0);
 
-            var disposeEditor = function(editorName,targetName,defaultValue) {
-                var editor = node[editorName];
-                var annot = editor.getSession().getAnnotations();
-                for (var k=0; k < annot.length; k++) {
-                    if (annot[k].type === "error") {
-                        noerr += annot.length;
-                        break;
-                    }
-                }
-                var val = editor.getValue();
-                if (defaultValue) {
-                    if (val.trim() == defaultValue.trim()) {
-                        val = "";
-                    }
-                }
+            const disposeEditor = function(editorName,targetName,defaultValue) {
+                const editor = node[editorName];
+                noerr += getEditorErrorCount(editor)
+                const val = getEditorValue(editor, defaultValue)
                 editor.destroy();
                 delete node[editorName];
                 $("#"+targetName).val(val);

package/core/network/31-tcpin.js

@@ -111,7 +111,7 @@ module.exports = function(RED) {
                     client = tls.connect(node.port, connOpts, function() {
                         buffer = (node.datatype == 'buffer') ? Buffer.alloc(0) : "";
                         node.connected = true;
-                        node.log(RED._("status.connected", {host: node.host, port: node.port}));
+                        node.log(RED._("tcpin.status.connected",{host:node.host,port:node.port}));
                         node.status({fill:"green",shape:"dot",text:"common.status.connected",_session:{type:"tcp",id:id}});
                     });
                 }
@@ -349,7 +349,7 @@ module.exports = function(RED) {
                     client = tls.connect(node.port, connOpts, function() {
                         // buffer = (node.datatype == 'buffer') ? Buffer.alloc(0) : "";
                         node.connected = true;
-                        node.log(RED._("status.connected", {host: node.host, port: node.port}));
+                        node.log(RED._("tcpin.status.connected",{host:node.host,port:node.port}));
                         node.status({fill:"green",shape:"dot",text:"common.status.connected"});
                     });
                 }

package/locales/fr/common/60-link.html

@@ -15,7 +15,7 @@
 -->
 
 <script type="text/html" data-help-name="link in">
-    <p>Crée des liens virtuelles entre les flux.</p>
+    <p>Crée des liens virtuels entre les flux.</p>
     <h3>Détails</h3>
     <p>Le noeud peut être connecté à n'importe quel noeud <code>Link out</code> qui existe sur n'importe quel onglet.
       Une fois connectés, ils se comportent comme s'ils étaient câblés ensemble.</p>
@@ -63,4 +63,4 @@
     </p>
     Le flux connecté à ce noeud doit se terminer par un noeud <code>Link out</code> configuré
      en mode 'retour'.</p>
-</script>
+</script>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "4.1.7",
+    "version": "4.1.8",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",