From 94ee739d91daca7af9b2c1c0f08ef344dd9016b3 Mon Sep 17 00:00:00 2001 From: Mauricio Bonani Date: Wed, 7 Jul 2021 09:12:58 -0400 Subject: [PATCH 1/5] Fix scriptFiles --- packages/node_modules/@node-red/editor-api/lib/editor/theme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js index de0106dbe..6d60c33e8 100644 --- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js +++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js @@ -243,7 +243,7 @@ module.exports = { ) themeContext.page.scripts = scriptFiles.concat(themeContext.page.scripts || []) theme.page = theme.page || {_:{}} - theme.page._.scripts = cssFiles.concat(theme.page._.scripts || []) + theme.page._.scripts = scriptFiles.concat(theme.page._.scripts || []) } } activeThemeInitialised = true; From 9b85200954c998df1a7108ce1df373f963455d40 Mon Sep 17 00:00:00 2001 From: Mauricio Bonani Date: Wed, 7 Jul 2021 09:24:14 -0400 Subject: [PATCH 2/5] Fix grip on panels separator --- .../editor-client/src/images/grip-horizontal.png | Bin 0 -> 90 bytes .../@node-red/editor-client/src/sass/panels.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png diff --git a/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png b/packages/node_modules/@node-red/editor-client/src/images/grip-horizontal.png new file mode 100644 index 0000000000000000000000000000000000000000..7bff7b4a25a00361baf2d1fe8793bbdf10b8c989 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^MnKHU!3HGR9riB)Qi`4~jv*HQ$tePeZu$mnRr)2P$UpboFyt=akR{0Hxd+761SM literal 0 HcmV?d00001 diff --git a/packages/node_modules/@node-red/editor-client/src/sass/panels.scss b/packages/node_modules/@node-red/editor-client/src/sass/panels.scss index 455aab891..9e2336578 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/panels.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/panels.scss @@ -40,7 +40,7 @@ height: 7px; box-sizing: border-box; cursor: ns-resize; - background: $primary-background url(images/grip.png) no-repeat 50% 50%; + background: $primary-background url(images/grip-horizontal.png) no-repeat 50% 50%; } From 6211dfe024654f3e3233681077249019bdb6fd62 Mon Sep 17 00:00:00 2001 From: Mauricio Bonani Date: Wed, 7 Jul 2021 09:52:47 -0400 Subject: [PATCH 3/5] Fix grip on horizontally displayed panels separator --- .../node_modules/@node-red/editor-client/src/sass/panels.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/node_modules/@node-red/editor-client/src/sass/panels.scss b/packages/node_modules/@node-red/editor-client/src/sass/panels.scss index 9e2336578..1a15d3c0d 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/panels.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/panels.scss @@ -70,5 +70,6 @@ width: 7px; display: inline-block; cursor: ew-resize; + background: $primary-background url(images/grip.png) no-repeat 50% 50%; } } From becbb09a294dec2c7bae764cd1afa1771052290c Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Thu, 8 Jul 2021 19:50:26 +0900 Subject: [PATCH 4/5] Add necessary modules and remove unnecessary module in dependencies --- packages/node_modules/@node-red/registry/package.json | 2 ++ packages/node_modules/@node-red/util/package.json | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json index b3c6b4f19..2d6aa77b2 100644 --- a/packages/node_modules/@node-red/registry/package.json +++ b/packages/node_modules/@node-red/registry/package.json @@ -17,6 +17,8 @@ ], "dependencies": { "@node-red/util": "1.3.5", + "clone": "2.1.2", + "fs-extra": "8.1.0", "semver": "6.3.0", "tar": "6.1.0", "uglify-js": "3.13.3" diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json index 330f4cd38..c17d5050f 100644 --- a/packages/node_modules/@node-red/util/package.json +++ b/packages/node_modules/@node-red/util/package.json @@ -15,7 +15,6 @@ } ], "dependencies": { - "clone": "2.1.2", "i18next": "15.1.2", "fs-extra": "8.1.0", "json-stringify-safe": "5.0.1", From d4a199f0e1ba5ae71579c118643189896f024b8b Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 16 Jul 2021 08:52:00 +0100 Subject: [PATCH 5/5] Avoid prototype pollution in RED.view.calculateTextDimensions --- .../@node-red/editor-client/src/js/ui/view.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js index d3c9340d8..031cf651e 100755 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js @@ -2335,6 +2335,7 @@ RED.view = (function() { var textDimensionPlaceholder = {}; var textDimensionCache = {}; function calculateTextDimensions(str,className) { + var cacheKey = "!"+str; if (!textDimensionPlaceholder[className]) { textDimensionPlaceholder[className] = document.createElement("span"); textDimensionPlaceholder[className].className = className; @@ -2343,15 +2344,15 @@ RED.view = (function() { document.getElementById("red-ui-editor").appendChild(textDimensionPlaceholder[className]); textDimensionCache[className] = {}; } else { - if (textDimensionCache[className][str]) { - return textDimensionCache[className][str] + if (textDimensionCache[className][cacheKey]) { + return textDimensionCache[className][cacheKey] } } textDimensionPlaceholder[className].textContent = (str||""); var w = textDimensionPlaceholder[className].offsetWidth; var h = textDimensionPlaceholder[className].offsetHeight; - textDimensionCache[className][str] = [w,h]; - return textDimensionCache[className][str]; + textDimensionCache[className][cacheKey] = [w,h]; + return textDimensionCache[className][cacheKey]; } function convertLineBreakCharacter(str) {