From f786c7f144d20008ad0b496b3ae2965261ec5eb7 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Thu, 13 Jan 2022 21:42:50 +0900
Subject: [PATCH 01/10] fix JSON propety validation of inject node

---
 .../node_modules/@node-red/nodes/core/common/20-inject.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index a5dcb061a..f233c62fd 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -234,7 +234,7 @@
                             }
                         } else if (v[i].vt === "jsonata") {
                             try{jsonata(v[i].v);}catch(e){return false;}
-                        } else if ([i].vt === "json") {
+                        } else if (v[i].vt === "json") {
                             try{JSON.parse(v[i].v);}catch(e){return false;}
                         }
                     }

From e7189ab81f3c1fadce09a9e2ba2ab9406a656e48 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Thu, 13 Jan 2022 23:52:06 +0900
Subject: [PATCH 02/10] fix unit value validation of delay node

---
 .../node_modules/@node-red/nodes/core/function/89-delay.html   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/89-delay.html b/packages/node_modules/@node-red/nodes/core/function/89-delay.html
index 3ae4637d7..8ee404924 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.html
@@ -114,7 +114,8 @@
             timeout: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
             timeoutUnits: {value:"seconds"},
             rate: {value:"1", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
-            nbRateUnits: {value:"1", required:false, validate:RED.validators.regex(/\d+|/)},
+            nbRateUnits: {value:"1", required:false,
+                          validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
             rateUnits: {value: "second"},
             randomFirst: {value:"1", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
             randomLast: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},

From a2c9458b1be417eb02f284f6295a7d3608fa4951 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Sat, 15 Jan 2022 13:11:56 +0900
Subject: [PATCH 03/10] aligin start of property error tooltip messages

---
 packages/node_modules/@node-red/editor-client/src/js/ui/view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 166cb2901..b471dd768 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
@@ -596,7 +596,7 @@ RED.view = (function() {
             },
             tooltip: function(d) {
                 if (d.validationErrors && d.validationErrors.length > 0) {
-                    return RED._("editor.errors.invalidProperties")+"\n  - "+d.validationErrors.join("\n    - ")
+                    return RED._("editor.errors.invalidProperties")+"\n  - "+d.validationErrors.join("\n  - ")
                 }
             },
             show: function(n) { return !n.valid }

From 085233ab9b01349766dfdb374b5c9c050d985bd1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 17 Jan 2022 21:27:21 +0000
Subject: [PATCH 04/10] Remember last sidebar tab between editor sessions

---
 .../@node-red/editor-client/src/js/red.js     |  3 +--
 .../editor-client/src/js/ui/sidebar.js        | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index 36e45e570..2b1c8f2e4 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -556,8 +556,7 @@ var RED = (function() {
 
         $(".red-ui-header-toolbar").show();
 
-
-        RED.sidebar.show(":first");
+        RED.sidebar.show(":first", true);
 
         setTimeout(function() {
             loader.end();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
index 7402870d4..eb10fe043 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
@@ -19,6 +19,15 @@ RED.sidebar = (function() {
     var sidebar_tabs;
     var knownTabs = {};
 
+    // We store the current sidebar tab id in localStorage as 'last-sidebar-tab'
+    // This is restored when the editor is reloaded.
+    // We use sidebar_tabs.onchange to update localStorage. However that will
+    // also get triggered when the first tab gets added to the tabs - typically
+    // the 'info' tab. So we use the following variable to store the retrieved
+    // value from localStorage before we start adding the actual tabs
+    var lastSessionSelectedTab = null;
+
+
     function addTab(title,content,closeable,visible) {
         var options;
         if (typeof title === "string") {
@@ -194,16 +203,16 @@ RED.sidebar = (function() {
         RED.events.emit("sidebar:resize");
     }
 
-    function showSidebar(id) {
+    function showSidebar(id, skipShowSidebar) {
         if (id === ":first") {
-            id = RED.settings.get("editor.sidebar.order",["info", "help", "version-control", "debug"])[0]
+            id = lastSessionSelectedTab || RED.settings.get("editor.sidebar.order",["info", "help", "version-control", "debug"])[0]
         }
         if (id) {
             if (!containsTab(id) && knownTabs[id]) {
                 sidebar_tabs.addTab(knownTabs[id]);
             }
             sidebar_tabs.activateTab(id);
-            if (!RED.menu.isSelected("menu-item-sidebar")) {
+            if (!skipShowSidebar && !RED.menu.isSelected("menu-item-sidebar")) {
                 RED.menu.setSelected("menu-item-sidebar",true);
             }
         }
@@ -227,6 +236,7 @@ RED.sidebar = (function() {
                 if (tab.toolbar) {
                     $(tab.toolbar).show();
                 }
+                RED.settings.setLocal("last-sidebar-tab", tab.id)
             },
             onremove: function(tab) {
                 $(tab.wrapper).hide();
@@ -255,7 +265,9 @@ RED.sidebar = (function() {
             }
         });
         RED.popover.tooltip($("#red-ui-sidebar-separator").find(".red-ui-sidebar-control-right"),RED._("keyboard.toggleSidebar"),"core:toggle-sidebar");
-        showSidebar();
+
+        lastSessionSelectedTab = RED.settings.getLocal("last-sidebar-tab")
+
         RED.sidebar.info.init();
         RED.sidebar.help.init();
         RED.sidebar.config.init();

From 5fc920087ba008871afaf462212425e3a3f3d8ac Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 17 Jan 2022 21:27:48 +0000
Subject: [PATCH 05/10] Store user zoom level in localStorage

---
 .../node_modules/@node-red/editor-client/src/js/ui/view.js | 7 +++++++
 1 file changed, 7 insertions(+)

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 3edb2ed39..7632f39d5 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
@@ -678,6 +678,11 @@ RED.view = (function() {
             show: function(n) { return !n.valid }
         })
 
+
+        var  userZoomLevel = parseFloat(RED.settings.getLocal('zoom-level'))
+        if (!isNaN(userZoomLevel)) {
+            scaleFactor = userZoomLevel
+        }
     }
 
 
@@ -1965,6 +1970,7 @@ RED.view = (function() {
     }
     function zoomZero() { zoomView(1); }
 
+
     function zoomView(factor) {
         var screenSize = [chart.width(),chart.height()];
         var scrollPos = [chart.scrollLeft(),chart.scrollTop()];
@@ -1977,6 +1983,7 @@ RED.view = (function() {
 
         RED.view.navigator.resize();
         redraw();
+        RED.settings.setLocal('zoom-level', factor.toFixed(1))
     }
 
     function selectNone() {

From a2e00740612a17d5777ac6c3de19dfc32ba471a0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 18 Jan 2022 09:20:52 +0000
Subject: [PATCH 06/10] Update marked to latest

---
 package.json                                                    | 2 +-
 .../node_modules/@node-red/editor-client/src/js/ui/utils.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fd6532c6e..c0ba83645 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
         "i18next-http-backend": "1.3.1",
         "jquery-i18next": "1.2.1",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
-        "marked": "3.0.7",
+        "marked": "4.0.10",
         "minami": "1.2.3",
         "mocha": "9.1.3",
         "node-red-node-test-helper": "^0.2.7",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
index 2f5f7063e..33f6c3ea1 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -109,7 +109,7 @@ RED.utils = (function() {
     window._marked.use({extensions: [descriptionList, description] } );
 
     function renderMarkdown(txt) {
-        var rendered = _marked(txt);
+        var rendered = _marked.parse(txt);
         var cleaned = DOMPurify.sanitize(rendered, {SAFE_FOR_JQUERY: true})
         return cleaned;
     }

From dbefe6a560df56ce10244f0ad4897ed87e793a5f Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 18 Jan 2022 09:26:42 +0000
Subject: [PATCH 07/10] Revert copy-text change and apply alternative fix

Reverts PR #3331 and applies the alternative fix originally proposed
in PR #3329
---
 .../editor-client/src/js/ui/clipboard.js      | 37 ++++++++++---------
 .../editor-client/src/sass/editor.scss        |  5 +++
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index f6a613f5f..cde9da938 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -946,23 +946,26 @@ RED.clipboard = (function() {
         if (truncated) {
             msg += "_truncated";
         }
-        navigator.clipboard.writeText(value).then(function () {
-            if (element) {
-                var popover = RED.popover.create({
-                    target: element,
-                    direction: 'left',
-                    size: 'small',
-                    content: RED._(msg)
-                });
-                setTimeout(function() {
-                    popover.close();
-                },1000);
-                popover.open();
-            }
-            if (currentFocus) {
-                $(currentFocus).focus();
-            }
-        }).catch(err => { console.error("Failed to copy:",err) });
+        var clipboardHidden = $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo(document.body);
+        clipboardHidden.val(value).focus().select();
+        var result =  document.execCommand("copy");
+        if (result && element) {
+            var popover = RED.popover.create({
+                target: element,
+                direction: 'left',
+                size: 'small',
+                content: RED._(msg)
+            });
+            setTimeout(function() {
+                popover.close();
+            },1000);
+            popover.open();
+        }
+        clipboardHidden.remove();
+        if (currentFocus) {
+            $(currentFocus).focus();
+        }
+        return result;
     }
 
     function importNodes(nodesStr,addFlow) {
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
index 96a0f998f..473571042 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -356,6 +356,11 @@ button.red-ui-button-small
     background: $secondary-background;
 }
 
+#red-ui-clipboard-hidden {
+    position: absolute;
+    top: -3000px;
+}
+
 .form-row .red-ui-editor-node-label-form-row {
     margin: 5px 0 0 50px;
     label {

From 211a5eb2bbb64f3c00c30427808ed0f56db9ec97 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 18 Jan 2022 09:46:57 +0000
Subject: [PATCH 08/10] Bump for 2.1.6

---
 CHANGELOG.md                                        | 13 +++++++++++++
 package.json                                        |  2 +-
 .../node_modules/@node-red/editor-api/package.json  |  6 +++---
 .../@node-red/editor-client/package.json            |  2 +-
 packages/node_modules/@node-red/nodes/package.json  |  2 +-
 .../node_modules/@node-red/registry/package.json    |  4 ++--
 .../node_modules/@node-red/runtime/package.json     |  6 +++---
 packages/node_modules/@node-red/util/package.json   |  2 +-
 packages/node_modules/node-red/package.json         | 10 +++++-----
 9 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b9daf8c0..30751ed4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+#### 2.1.6: Maintenance Release
+
+Editor
+
+ - Revert copy-text change and apply alternative fix (#3363) @knolleary
+ - Update marked to latest (#3362) @knolleary
+ - fix to make start of property error tooltip messages aligned (#3358) @HiroyasuNishiyama
+
+Nodes
+
+ - Inject: fix JSON propety validation of inject node (#3349) @HiroyasuNishiyama
+ - Delay: fix unit value validation of delay node (#3351) @HiroyasuNishiyama
+
 #### 2.1.5: Maintenance Release
 
 Runtime
diff --git a/package.json b/package.json
index c0ba83645..0d190fdc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index da76b539f..c75ee5451 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.5",
-        "@node-red/editor-client": "2.1.5",
+        "@node-red/util": "2.1.6",
+        "@node-red/editor-client": "2.1.6",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.1",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index 1b73f54df..f982c2a49 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 13c9040cb..be47520a8 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 3cf41845e..2ac0ca51b 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.5",
+        "@node-red/util": "2.1.6",
         "clone": "2.1.2",
         "fs-extra": "10.0.0",
         "semver": "7.3.5",
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index 63a4899bc..476c3c254 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "2.1.5",
-        "@node-red/util": "2.1.5",
+        "@node-red/registry": "2.1.6",
+        "@node-red/util": "2.1.6",
         "async-mutex": "0.3.2",
         "clone": "2.1.2",
         "express": "4.17.2",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 52f66cba4..6e92e54b6 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 46ddebb68..009b3403d 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "2.1.5",
-        "@node-red/runtime": "2.1.5",
-        "@node-red/util": "2.1.5",
-        "@node-red/nodes": "2.1.5",
+        "@node-red/editor-api": "2.1.6",
+        "@node-red/runtime": "2.1.6",
+        "@node-red/util": "2.1.6",
+        "@node-red/nodes": "2.1.6",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.2",

From 5effcdb024aac494407418ae78aa0962e0133ae4 Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 19 Jan 2022 23:45:13 +0900
Subject: [PATCH 09/10] use setCookieSync instead of setCookie

---
 .../@node-red/nodes/core/network/21-httprequest.js        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
index f5054eb81..bf677b490 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -264,7 +264,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
             if (opts.headers.hasOwnProperty('cookie')) {
                 var cookies = cookie.parse(opts.headers.cookie, {decode:String});
                 for (var name in cookies) {
-                    opts.cookieJar.setCookie(cookie.serialize(name, cookies[name], {encode:String}), url, {ignoreError: true});
+                    opts.cookieJar.setCookieSync(cookie.serialize(name, cookies[name], {encode:String}), url, {ignoreError: true});
                 }
                 delete opts.headers.cookie;
             }
@@ -277,13 +277,13 @@ in your Node-RED user directory (${RED.settings.userDir}).
                         } else if (typeof msg.cookies[name] === 'object') {
                             if(msg.cookies[name].encode === false){
                                 // If the encode option is false, the value is not encoded.
-                                opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name].value, {encode: String}), url, {ignoreError: true});
+                                opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name].value, {encode: String}), url, {ignoreError: true});
                             } else {
                                 // The value is encoded by encodeURIComponent().
-                                opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name].value), url, {ignoreError: true});
+                                opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name].value), url, {ignoreError: true});
                             }
                         } else {
-                            opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name]), url, {ignoreError: true});
+                            opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name]), url, {ignoreError: true});
                         }
                     }
                 }

From d679b026582ca853ca57668f78817bcbf832bcec Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 24 Jan 2022 21:04:27 +0000
Subject: [PATCH 10/10] Add option to remember zoom and scroll position in
 localStorage

---
 .../editor-client/locales/en-US/editor.json   |  2 +
 .../editor-client/src/js/ui/userSettings.js   |  7 ++++
 .../@node-red/editor-client/src/js/ui/view.js | 38 +++++++++++++++++--
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index cbc29185d..0c4edb87b 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -75,6 +75,8 @@
             "view": {
                 "view": "View",
                 "grid": "Grid",
+                "storeZoom": "Restore zoom level on load",
+                "storePosition": "Restore scroll position on load",
                 "showGrid": "Show grid",
                 "snapGrid": "Snap to grid",
                 "gridSize": "Grid size",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
index 3c1e295d2..1b61f396e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
@@ -121,6 +121,13 @@ RED.userSettings = (function() {
         //         {setting:"theme", label:"Theme",options:function(done){ done([{val:'',text:'default'}].concat(RED.settings.theme("themes"))) }},
         //     ]
         // },
+        {
+            title: "menu.label.view.view",
+            options: [
+                {setting:"view-store-zoom",label:"menu.label.view.storeZoom", default: false, toggle:true, onchange: function(val) { if (!val) { RED.settings.removeLocal("zoom-level")}}},
+                {setting:"view-store-position",label:"menu.label.view.storePosition", default: false, toggle:true, onchange: function(val) { if (!val) { RED.settings.removeLocal("scroll-positions")}}},
+            ]
+        },
         {
             title: "menu.label.view.grid",
             options: [
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 7632f39d5..f9ee1d44d 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
@@ -678,10 +678,38 @@ RED.view = (function() {
             show: function(n) { return !n.valid }
         })
 
+        if (RED.settings.get("editor.view.view-store-zoom")) {
+            var  userZoomLevel = parseFloat(RED.settings.getLocal('zoom-level'))
+            if (!isNaN(userZoomLevel)) {
+                scaleFactor = userZoomLevel
+            }
+        }
 
-        var  userZoomLevel = parseFloat(RED.settings.getLocal('zoom-level'))
-        if (!isNaN(userZoomLevel)) {
-            scaleFactor = userZoomLevel
+        var onScrollTimer = null;
+        function storeScrollPosition() {
+            workspaceScrollPositions[RED.workspaces.active()] = {
+                left:chart.scrollLeft(),
+                top:chart.scrollTop()
+            };
+            RED.settings.setLocal('scroll-positions', JSON.stringify(workspaceScrollPositions) )
+        }
+        chart.on("scroll", function() {
+            if (RED.settings.get("editor.view.view-store-position")) {
+                if (onScrollTimer) {
+                    clearTimeout(onScrollTimer)
+                }
+                onScrollTimer = setTimeout(storeScrollPosition, 200);
+            }
+        })
+
+        if (RED.settings.get("editor.view.view-store-position")) {
+            var scrollPositions = RED.settings.getLocal('scroll-positions')
+            if (scrollPositions) {
+                try {
+                    workspaceScrollPositions = JSON.parse(scrollPositions)
+                } catch(err) {
+                }
+            }
         }
     }
 
@@ -1983,7 +2011,9 @@ RED.view = (function() {
 
         RED.view.navigator.resize();
         redraw();
-        RED.settings.setLocal('zoom-level', factor.toFixed(1))
+        if (RED.settings.get("editor.view.view-store-zoom")) {
+            RED.settings.setLocal('zoom-level', factor.toFixed(1))
+        }
     }
 
     function selectNone() {