mirror of
https://github.com/node-red/node-red.git
synced 2025-12-27 07:31:07 +01:00
Merge branch 'master' into master
This commit is contained in:
@@ -164,6 +164,7 @@
|
||||
}
|
||||
},
|
||||
"actions": {
|
||||
"open-event-log": "Open event log",
|
||||
"toggle-navigator": "Toggle navigator",
|
||||
"zoom-out": "Zoom out",
|
||||
"zoom-reset": "Reset zoom",
|
||||
|
||||
@@ -164,6 +164,7 @@
|
||||
}
|
||||
},
|
||||
"actions": {
|
||||
"open-event-log": "イベントログを開く",
|
||||
"toggle-navigator": "ナビゲータの表示/非表示を切替",
|
||||
"zoom-out": "縮小",
|
||||
"zoom-reset": "拡大/縮小を初期化",
|
||||
|
||||
@@ -51,6 +51,7 @@ RED.eventLog = (function() {
|
||||
align: "right",
|
||||
element: statusWidget
|
||||
});
|
||||
RED.popover.tooltip(statusWidget, RED._('actions.open-event-log'));
|
||||
RED.statusBar.hide("red-ui-event-log-status");
|
||||
|
||||
},
|
||||
|
||||
@@ -336,6 +336,16 @@ RED.palette.editor = (function() {
|
||||
|
||||
const moduleInfo = nodeEntries[module].info;
|
||||
const nodeEntry = nodeEntries[module].elements;
|
||||
|
||||
if (!moduleInfo.url) {
|
||||
if (loadedIndex[module] && loadedIndex[module].url) {
|
||||
// Add the link to the node documentation if the catalog contains it
|
||||
moduleInfo.url = loadedIndex[module].url;
|
||||
const titleRow = $(nodeEntry.container).find("div.red-ui-palette-module-header > div.red-ui-palette-module-meta.red-ui-palette-module-name");
|
||||
$('<a target="_blank" class="red-ui-palette-module-link"><i class="fa fa-external-link"></i></a>').attr('href', moduleInfo.url).appendTo(titleRow);
|
||||
}
|
||||
}
|
||||
|
||||
if (nodeEntry) {
|
||||
const setCount = [];
|
||||
|
||||
|
||||
@@ -152,7 +152,9 @@ in your Node-RED user directory (${RED.settings.userDir}).
|
||||
const asLowercase = name.toLowercase();
|
||||
return headersObject[Object.keys(headersObject).find(k => k.toLowerCase() === asLowercase)];
|
||||
}
|
||||
this.count = 0;
|
||||
this.on("input",function(msg,nodeSend,nodeDone) {
|
||||
node.count++;
|
||||
checkNodeAgentPatch();
|
||||
//reset redirectList on each request
|
||||
redirectList = [];
|
||||
@@ -658,7 +660,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
|
||||
catch(e) { node.warn(RED._("httpin.errors.json-error")); }
|
||||
}
|
||||
}
|
||||
node.status({});
|
||||
node.count--;
|
||||
if (node.count === 0) {
|
||||
node.status({});
|
||||
}
|
||||
nodeSend(msg);
|
||||
nodeDone();
|
||||
}).catch(err => {
|
||||
|
||||
@@ -146,16 +146,16 @@ module.exports = function(RED) {
|
||||
var pos = 0;
|
||||
var data = value;
|
||||
msg.parts.len = node.arraySplt;
|
||||
const newmsg = RED.util.cloneMessage(msg)
|
||||
for (var i=0; i<count; i++) {
|
||||
var m = data.slice(pos,pos+node.arraySplt);
|
||||
if (node.arraySplt === 1) {
|
||||
m = m[0];
|
||||
}
|
||||
const newmsg = RED.util.cloneMessage(msg)
|
||||
RED.util.setMessageProperty(newmsg,node.property,m);
|
||||
newmsg.parts.index = i;
|
||||
pos += node.arraySplt;
|
||||
send(newmsg);
|
||||
send(RED.util.cloneMessage(newmsg));
|
||||
}
|
||||
done();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user