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

Track node moves separately to node config changes

Browse Source
This commit is contained in:
Nick O'Leary 2017-04-23 23:20:36 +01:00
parent b6510d66e0
commit aa1b2808e7
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/js/history.js
View File

@ -175,7 +175,7 @@ RED.history = (function() {
n.n.x = n.ox; n.n.x = n.ox;
n.n.y = n.oy; n.n.y = n.oy;
n.n.dirty = true; n.n.dirty = true;
n.n.changed = n.changed; n.n.moved = n.moved;
} }
// A move could have caused a link splice // A move could have caused a link splice
if (ev.links) { if (ev.links) {

12
editor/js/ui/view.js
View File

@ -485,6 +485,7 @@ RED.view = (function() {
} }
nn.changed = true; nn.changed = true;
nn.moved = true;
nn.w = node_width; nn.w = node_width;
nn.h = Math.max(node_height,(nn.outputs||0) * 15); nn.h = Math.max(node_height,(nn.outputs||0) * 15);
@ -953,9 +954,9 @@ RED.view = (function() {
if (moving_set.length > 0) { if (moving_set.length > 0) {
var ns = []; var ns = [];
for (var j=0;j<moving_set.length;j++) { for (var j=0;j<moving_set.length;j++) {
ns.push({n:moving_set[j].n,ox:moving_set[j].ox,oy:moving_set[j].oy,changed:moving_set[j].n.changed}); ns.push({n:moving_set[j].n,ox:moving_set[j].ox,oy:moving_set[j].oy,moved:moving_set[j].n.moved});
moving_set[j].n.dirty = true; moving_set[j].n.dirty = true;
moving_set[j].n.changed = true; moving_set[j].n.moved = true;
} }
historyEvent = {t:"move",nodes:ns,dirty:RED.nodes.dirty()}; historyEvent = {t:"move",nodes:ns,dirty:RED.nodes.dirty()};
if (activeSpliceLink) { if (activeSpliceLink) {
@ -1141,8 +1142,8 @@ RED.view = (function() {
if (moving_set.length > 0) { if (moving_set.length > 0) {
var ns = []; var ns = [];
for (var i=0;i<moving_set.length;i++) { for (var i=0;i<moving_set.length;i++) {
ns.push({n:moving_set[i].n,ox:moving_set[i].ox,oy:moving_set[i].oy,changed:moving_set[i].n.changed}); ns.push({n:moving_set[i].n,ox:moving_set[i].ox,oy:moving_set[i].oy,moved:moving_set[i].n.moved});
moving_set[i].n.changed = true; moving_set[i].n.moved = true;
moving_set[i].n.dirty = true; moving_set[i].n.dirty = true;
delete moving_set[i].ox; delete moving_set[i].ox;
delete moving_set[i].oy; delete moving_set[i].oy;
@ -1165,7 +1166,7 @@ RED.view = (function() {
for (var i=0;i<moving_set.length;i++) { for (var i=0;i<moving_set.length;i++) {
node = moving_set[i]; node = moving_set[i];
node.n.changed = true; node.n.moved = true;
node.n.dirty = true; node.n.dirty = true;
if (node.ox == null && node.oy == null) { if (node.ox == null && node.oy == null) {
node.ox = node.n.x; node.ox = node.n.x;
@ -2533,6 +2534,7 @@ RED.view = (function() {
node = new_ms[i]; node = new_ms[i];
node.n.selected = true; node.n.selected = true;
node.n.changed = true; node.n.changed = true;
node.n.moved = true;
node.n.x -= dx - mouse_position[0]; node.n.x -= dx - mouse_position[0];
node.n.y -= dy - mouse_position[1]; node.n.y -= dy - mouse_position[1];
node.dx = node.n.x - mouse_position[0]; node.dx = node.n.x - mouse_position[0];