frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Nick O'Leary
2019-04-29 08:45:07 +01:00
parent c9c6f41aad 742bf85a89
commit 7ec999475e
11 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,7 @@
#### 0.20.5: Maintenance Release
- Revert error handling in palette manager
#### 0.20.4: Maintenance Release
- Switch media-typer to content-type module Fixes #2122 #2123
@@ -12,6 +16,8 @@
- Add explanation to the help text on the new feature to build query string from msg.payload #2116
- Bump bcrypt to latest
- Add Korean locales files for nodes #2100
- Add error message if catalog is invalid json
- Reduce udp out timeout to be less than default inject at start #2127
#### 0.20.3: Maintenance Release

18
package.json
View File

@@ -27,33 +27,33 @@
"ajv": "6.10.0",
"basic-auth": "2.0.1",
"bcryptjs": "2.4.3",
"body-parser": "1.18.3",
"body-parser": "1.19.0",
"cheerio": "0.22.0",
"clone": "2.1.2",
"content-type": "1.0.4",
"cookie": "0.3.1",
"cookie-parser": "1.4.4",
"cors": "2.8.5",
"cron": "1.7.0",
"cron": "1.7.1",
"denque": "1.4.1",
"express": "4.16.4",
"express-session": "1.15.6",
"express-session": "1.16.1",
"fs-extra": "7.0.1",
"fs.notify": "0.0.4",
"hash-sum": "1.0.2",
"https-proxy-agent": "2.2.1",
"i18next": "15.0.9",
"i18next": "15.1.0",
"iconv-lite": "0.4.24",
"is-utf8": "0.2.1",
"js-yaml": "3.13.0",
"js-yaml": "3.13.1",
"json-stringify-safe": "5.0.1",
"jsonata": "1.6.4",
"memorystore": "1.6.1",
"mime": "2.4.0",
"mime": "2.4.2",
"mqtt": "2.18.8",
"multer": "1.4.1",
"mustache": "3.0.1",
"node-red-node-email": "^1.3.0",
"node-red-node-email": "^1.4.0",
"node-red-node-feedparser": "^0.1.14",
"node-red-node-rbe": "^0.2.4",
"node-red-node-sentiment": "^0.1.3",
@@ -65,10 +65,10 @@
"passport": "0.4.0",
"passport-http-bearer": "1.0.1",
"passport-oauth2-client-password": "0.1.2",
"raw-body": "2.3.3",
"raw-body": "2.4.0",
"request": "2.88.0",
"semver": "6.0.0",
"uglify-js": "3.5.3",
"uglify-js": "3.5.9",
"when": "3.7.8",
"ws": "6.2.1",
"xml2js": "0.4.19"

6
packages/node_modules/@node-red/editor-api/package.json vendored
View File

@@ -19,13 +19,13 @@
"@node-red/util": "0.21.0-alpha.0",
"@node-red/editor-client": "0.21.0-alpha.0",
"bcryptjs": "2.4.3",
"body-parser": "1.18.3",
"body-parser": "1.19.0",
"clone": "2.1.2",
"cors": "2.8.5",
"express-session": "1.15.6",
"express-session": "1.16.1",
"express": "4.16.4",
"memorystore": "1.6.1",
"mime": "2.4.0",
"mime": "2.4.2",
"mustache": "3.0.1",
"oauth2orize": "1.11.0",
"passport-http-bearer": "1.0.1",

10
packages/node_modules/@node-red/editor-client/src/js/ui/palette.js vendored
View File

@@ -254,8 +254,8 @@ RED.palette = (function() {
$(d).draggable({
helper: 'clone',
appendTo: 'body',
revert: true,
revertDuration: 50,
revert: 'invalid',
revertDuration: 300,
containment:'#main-container',
start: function() {
paletteWidth = $("#palette").width();
@@ -264,11 +264,7 @@ RED.palette = (function() {
},
stop: function() { d3.select('.link_splice').classed('link_splice',false); if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null;}},
drag: function(e,ui) {
// TODO: this is the margin-left of palette node. Hard coding
// it here makes me sad
//console.log(ui.helper.position());
ui.position.left += 17.5;
ui.originalPosition.left = $('#' + e.target.id).offset().left;
if (def.inputs > 0 && def.outputs > 0) {
mouseX = ui.position.left-paletteWidth+(ui.helper.width()/2) - chartOffset.left + chart.scrollLeft();

2
packages/node_modules/@node-red/nodes/core/core/60-link.html vendored
View File

@@ -54,7 +54,7 @@
flowMap[activeSubflow.id] = {
id: activeSubflow.id,
class: 'palette-header',
label: "Subflow : "+(activeSubflow.name || activeSubflow.id)+(node.z===ws.id ? " *":""),
label: "Subflow : "+(activeSubflow.name || activeSubflow.id),
expanded: true,
children: []
};

11
packages/node_modules/@node-red/nodes/core/core/89-delay.js vendored
View File

@@ -88,10 +88,11 @@ module.exports = function(RED) {
};
}
var clearDelayList = function() {
var clearDelayList = function(s) {
for (var i=0; i<node.idList.length; i++ ) { node.idList[i].clear(); }
node.idList = [];
node.status({text:"reset"});
if (s) { node.status({text:"reset"}); }
else { node.status({}); }
}
var flushDelayList = function() {
@@ -124,7 +125,7 @@ module.exports = function(RED) {
if ((node.timeout > 1000) && (node.idList.length !== 0)) {
node.status({fill:"blue",shape:"dot",text:" "});
}
if (msg.hasOwnProperty("reset")) { clearDelayList(); }
if (msg.hasOwnProperty("reset")) { clearDelayList(true); }
}
});
node.on("close", function() { clearDelayList(); });
@@ -145,7 +146,7 @@ module.exports = function(RED) {
if ((delayvar >= 0) && (node.idList.length !== 0)) {
node.status({fill:"blue",shape:"dot",text:delayvar/1000+"s"});
}
if (msg.hasOwnProperty("reset")) { clearDelayList(); }
if (msg.hasOwnProperty("reset")) { clearDelayList(true); }
if (msg.hasOwnProperty("flush")) { flushDelayList(); }
});
node.on("close", function() { clearDelayList(); });
@@ -267,7 +268,7 @@ module.exports = function(RED) {
if ((node.timeout >= 1000) && (node.idList.length !== 0)) {
node.status({fill:"blue",shape:"dot",text:parseInt(wait/10)/100+"s"});
}
if (msg.hasOwnProperty("reset")) { clearDelayList(); }
if (msg.hasOwnProperty("reset")) { clearDelayList(true); }
if (msg.hasOwnProperty("flush")) { flushDelayList(); }
});
node.on("close", function() { clearDelayList(); });

2
packages/node_modules/@node-red/nodes/core/io/32-udp.js vendored
View File

@@ -251,7 +251,7 @@ module.exports = function(RED) {
}
}
});
}, 150);
}, 75);
node.on("close", function() {
if (node.tout) { clearTimeout(node.tout); }

8
packages/node_modules/@node-red/nodes/package.json vendored
View File

@@ -16,25 +16,25 @@
],
"dependencies": {
"ajv": "6.10.0",
"body-parser": "1.18.3",
"body-parser": "1.19.0",
"cheerio": "0.22.0",
"content-type": "1.0.4",
"cookie-parser": "1.4.4",
"cookie": "0.3.1",
"cors": "2.8.5",
"cron": "1.7.0",
"cron": "1.7.1",
"denque": "1.4.1",
"fs-extra": "7.0.1",
"fs.notify": "0.0.4",
"hash-sum": "1.0.2",
"https-proxy-agent": "2.2.1",
"is-utf8": "0.2.1",
"js-yaml": "3.13.0",
"js-yaml": "3.13.1",
"mqtt": "2.18.8",
"multer": "1.4.1",
"mustache": "3.0.1",
"on-headers": "1.0.2",
"raw-body": "2.3.3",
"raw-body": "2.4.0",
"request": "2.88.0",
"ws": "6.2.1",
"xml2js": "0.4.19",

2
packages/node_modules/@node-red/registry/package.json vendored
View File

@@ -18,7 +18,7 @@
"dependencies": {
"@node-red/util": "0.21.0-alpha.0",
"semver": "6.0.0",
"uglify-js": "3.5.3",
"uglify-js": "3.5.9",
"when": "3.7.8"
}
}

2
packages/node_modules/@node-red/util/package.json vendored
View File

@@ -16,7 +16,7 @@
],
"dependencies": {
"clone": "2.1.2",
"i18next": "15.0.9",
"i18next": "15.1.0",
"json-stringify-safe": "5.0.1",
"jsonata": "1.6.4",
"when": "3.7.8"

2
packages/node_modules/node-red/package.json vendored
View File

@@ -39,7 +39,7 @@
"bcryptjs": "2.4.3",
"express": "4.16.4",
"fs-extra": "7.0.1",
"node-red-node-email": "^1.3.0",
"node-red-node-email": "^1.4.0",
"node-red-node-feedparser": "^0.1.14",
"node-red-node-rbe": "^0.2.4",
"node-red-node-sentiment": "^0.1.3",