From d679b026582ca853ca57668f78817bcbf832bcec Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 24 Jan 2022 21:04:27 +0000 Subject: [PATCH] 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() {