From 90761fd840b8438c9b5d832713eea8fcf0c48fc1 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 13 May 2021 17:23:25 +0100 Subject: [PATCH 1/2] Fix 'SyntaxError' in Function node when last line of on-stop is a comment --- .../node_modules/@node-red/nodes/core/function/10-function.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.js b/packages/node_modules/@node-red/nodes/core/function/10-function.js index 17e6e569a..1b3dc3ba9 100644 --- a/packages/node_modules/@node-red/nodes/core/function/10-function.js +++ b/packages/node_modules/@node-red/nodes/core/function/10-function.js @@ -366,7 +366,8 @@ module.exports = function(RED) { __node__.error("Cannot send from close function"); } }; - `+node.fin +`})();`; + `+node.fin +` + })();`; finOpt = createVMOpt(node, " cleanup"); finScript = new vm.Script(finText, finOpt); } @@ -489,4 +490,3 @@ module.exports = function(RED) { }); RED.library.register("functions"); }; - From be9521f659569da81f7634411ee71d33baa32708 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 14 May 2021 21:17:47 +0100 Subject: [PATCH 2/2] Revert some of #2967 to fix treeList gutter width calculation --- .../@node-red/editor-client/src/js/ui/common/treeList.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js index 7f7eba1ba..6619ad76e 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js @@ -312,7 +312,8 @@ } if (child.depth !== parent.depth+1) { child.depth = parent.depth+1; - var labelPaddingWidth = ((child.gutter ? child.gutter[0].offsetWidth + 2 : 0) + (child.depth * 20)); + // var labelPaddingWidth = ((child.gutter ? child.gutter[0].offsetWidth + 2 : 0) + (child.depth * 20)); + var labelPaddingWidth = ((child.gutter?child.gutter.width()+2:0)+(child.depth*20)); child.treeList.labelPadding.width(labelPaddingWidth+'px'); if (child.element) { $(child.element).css({ @@ -531,7 +532,8 @@ }).appendTo(label) } - var labelPaddingWidth = (item.gutter ? item.gutter[0].offsetWidth + 2 : 0) + (depth * 20) + var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(depth*20); + // var labelPaddingWidth = (item.gutter ? item.gutter[0].offsetWidth + 2 : 0) + (depth * 20) item.treeList.labelPadding = $('').css({ display: "inline-block", width: labelPaddingWidth+'px'