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 34ed30cef..1c4c66240 100644 --- 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 @@ -719,6 +719,7 @@ "nodeHelp": "Node Help", "showHelp": "Show help", "showInOutline": "Show in outline", + "hideTopics": "Hide topics", "showTopics": "Show topics", "noHelp": "No help topic selected", "changeLog": "Change Log" diff --git a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json index 6faa1ed24..bf077b3f7 100644 --- a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json @@ -719,6 +719,7 @@ "nodeHelp": "Aide sur les noeuds", "showHelp": "Afficher l'aide", "showInOutline": "Afficher dans les grandes lignes", + "hideTopics": "Masquer les sujets", "showTopics": "Afficher les sujets", "noHelp": "Aucune rubrique d'aide sélectionnée", "changeLog": "Journal des modifications" diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js index ba9d54e28..4f1435d26 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js @@ -741,9 +741,16 @@ RED.editor = (function() { } try { - var rc = editing_node._def.oneditsave.call(editing_node); + const rc = editing_node._def.oneditsave.call(editing_node); if (rc === true) { editState.changed = true; + } else if (typeof rc === 'object' && rc !== null ) { + if (rc.changed === true) { + editState.changed = true + } + if (Array.isArray(rc.history) && rc.history.length > 0) { + editState.history = rc.history + } } } catch(err) { console.warn("oneditsave",editing_node.id,editing_node.type,err.toString()); @@ -1026,7 +1033,7 @@ RED.editor = (function() { } }); } - var historyEvent = { + let historyEvent = { t:'edit', node:editing_node, changes:editState.changes, @@ -1042,6 +1049,15 @@ RED.editor = (function() { instances:subflowInstances } } + + if (editState.history) { + historyEvent = { + t: 'multi', + events: [ historyEvent, ...editState.history ], + dirty: wasDirty + } + } + RED.history.push(historyEvent); } editing_node.dirty = true; diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js index e2c8185cb..b8e3aa0ba 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js @@ -382,9 +382,11 @@ RED.sidebar.config = (function() { refreshConfigNodeList(); } }); + RED.popover.tooltip($('#red-ui-sidebar-config-filter-all'), RED._("sidebar.config.showAllConfigNodes")); RED.popover.tooltip($('#red-ui-sidebar-config-filter-unused'), RED._("sidebar.config.showAllUnusedConfigNodes")); - + RED.popover.tooltip($('#red-ui-sidebar-config-collapse-all'), RED._("palette.actions.collapse-all")); + RED.popover.tooltip($('#red-ui-sidebar-config-expand-all'), RED._("palette.actions.expand-all")); } function flashConfigNode(el) { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js index 8bfc5526e..b3d06f701 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js @@ -36,7 +36,13 @@ RED.sidebar.help = (function() { toolbar = $("