frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3708 from Steve-Mcl/fix-undo-drop-still-dirty

Browse Source 
Ensure workspace clean after undoing dropped node
This commit is contained in:
Nick O'Leary 2022-06-27 14:12:50 +01:00 committed by GitHub
commit 5f40dc37a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js vendored
View File

@ -979,13 +979,14 @@ RED.view.tools = (function() {
* - it uses `<paletteLabel> <N>` - where N is the next available integer that * - it uses `<paletteLabel> <N>` - where N is the next available integer that
* doesn't clash with any existing nodes of that type * doesn't clash with any existing nodes of that type
* @param {Object} node The node to set the name of - if not provided, uses current selection * @param {Object} node The node to set the name of - if not provided, uses current selection
* @param {{ renameBlank: boolean, renameClash: boolean, generateHistory: boolean }} options Possible options are `renameBlank`, `renameClash` and `generateHistory`
*/ */
function generateNodeNames(node, options) { function generateNodeNames(node, options) {
options = options || { options = Object.assign({
renameBlank: true, renameBlank: true,
renameClash: true, renameClash: true,
generateHistory: true generateHistory: true
} }, options)
let nodes = node; let nodes = node;
if (node) { if (node) {
if (!Array.isArray(node)) { if (!Array.isArray(node)) {

3
packages/node_modules/@node-red/editor-client/src/js/ui/view.js vendored
View File

@ -5872,6 +5872,7 @@ RED.view = (function() {
* @private * @private
*/ */
function createNode(type, x, y, z) { function createNode(type, x, y, z) {
const wasDirty = RED.nodes.dirty()
var m = /^subflow:(.+)$/.exec(type); var m = /^subflow:(.+)$/.exec(type);
var activeSubflow = z ? RED.nodes.subflow(z) : null; var activeSubflow = z ? RED.nodes.subflow(z) : null;
if (activeSubflow && m) { if (activeSubflow && m) {
@ -5930,7 +5931,7 @@ RED.view = (function() {
var historyEvent = { var historyEvent = {
t: "add", t: "add",
nodes: [nn.id], nodes: [nn.id],
dirty: RED.nodes.dirty() dirty: wasDirty
} }
if (activeSubflow) { if (activeSubflow) {
var subflowRefresh = RED.subflow.refresh(true); var subflowRefresh = RED.subflow.refresh(true);

2
packages/node_modules/@node-red/nodes/core/common/21-debug.html vendored
View File

@ -558,7 +558,7 @@
onadd: function() { onadd: function() {
if (this.name === '_DEFAULT_') { if (this.name === '_DEFAULT_') {
this.name = '' this.name = ''
RED.actions.invoke("core:generate-node-names", this) RED.actions.invoke("core:generate-node-names", this, {generateHistory: false})
} }
} }
}); });

2
packages/node_modules/@node-red/nodes/core/common/60-link.html vendored
View File

@ -221,7 +221,7 @@
function onAdd() { function onAdd() {
if (this.name === '_DEFAULT_') { if (this.name === '_DEFAULT_') {
this.name = '' this.name = ''
RED.actions.invoke("core:generate-node-names", this) RED.actions.invoke("core:generate-node-names", this, {generateHistory: false})
} }
for (var i=0;i<this.links.length;i++) { for (var i=0;i<this.links.length;i++) {
var n = RED.nodes.node(this.links[i]); var n = RED.nodes.node(this.links[i]);

2
packages/node_modules/@node-red/nodes/core/function/10-function.html vendored
View File

@ -639,7 +639,7 @@
onadd: function() { onadd: function() {
if (this.name === '_DEFAULT_') { if (this.name === '_DEFAULT_') {
this.name = '' this.name = ''
RED.actions.invoke("core:generate-node-names", this) RED.actions.invoke("core:generate-node-names", this, {generateHistory: false})
} }
} }
}); });