StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes in undo/redo of `moveNodes` action

This commit is contained in:
jos 2018-08-09 13:02:12 +02:00
parent 872bd2d186
commit 07f04be182
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/History.js
View File

@ -130,8 +130,7 @@ function History (editor) {
'undo': function (params) { 'undo': function (params) {
var oldParentNode = findNode(params.oldParentPath); var oldParentNode = findNode(params.oldParentPath);
var newParentNode = findNode(params.newParentPath); var newParentNode = findNode(params.newParentPath);
var offset = (oldParentNode === newParentNode && params.oldIndex > params.newIndex) ? params.count : 0; var oldBeforeNode = oldParentNode.childs[params.oldIndex] || oldParentNode.append;
var oldBeforeNode = oldParentNode.childs[params.oldIndex + offset] || oldParentNode.append;
// first copy the nodes, then move them // first copy the nodes, then move them
var nodes = newParentNode.childs.slice(params.newIndex, params.newIndex + params.count); var nodes = newParentNode.childs.slice(params.newIndex, params.newIndex + params.count);
@ -144,8 +143,7 @@ function History (editor) {
'redo': function (params) { 'redo': function (params) {
var oldParentNode = findNode(params.oldParentPath); var oldParentNode = findNode(params.oldParentPath);
var newParentNode = findNode(params.newParentPath); var newParentNode = findNode(params.newParentPath);
var offset = (oldParentNode === newParentNode && params.oldIndex < params.newIndex) ? params.count : 0; var newBeforeNode = newParentNode.childs[params.newIndex] || newParentNode.append;
var newBeforeNode = newParentNode.childs[params.newIndex + offset] || newParentNode.append;
// first copy the nodes, then move them // first copy the nodes, then move them
var nodes = oldParentNode.childs.slice(params.oldIndex, params.oldIndex + params.count); var nodes = oldParentNode.childs.slice(params.oldIndex, params.oldIndex + params.count);

26
src/js/Node.js
View File

@ -1807,6 +1807,7 @@ Node.onDragStart = function (nodes, event) {
var firstNode = nodes[0]; var firstNode = nodes[0];
var lastNode = nodes[nodes.length - 1]; var lastNode = nodes[nodes.length - 1];
var parent = firstNode.parent;
var draggedNode = Node.getNodeFromTarget(event.target); var draggedNode = Node.getNodeFromTarget(event.target);
var editor = firstNode.editor; var editor = firstNode.editor;
@ -1831,8 +1832,8 @@ Node.onDragStart = function (nodes, event) {
oldCursor: document.body.style.cursor, oldCursor: document.body.style.cursor,
oldSelection: editor.getDomSelection(), oldSelection: editor.getDomSelection(),
oldPaths: nodes.map(getInternalPath), oldPaths: nodes.map(getInternalPath),
oldParent: firstNode.parent, oldParent: parent,
oldIndex: firstNode.getIndex(), oldNextNode: parent.childs[lastNode.getIndex() + 1] || parent.append,
mouseX: event.pageX, mouseX: event.pageX,
offsetY: offsetY, offsetY: offsetY,
level: firstNode.getLevel() level: firstNode.getLevel()
@ -2031,7 +2032,7 @@ Node.onDragEnd = function (nodes, event) {
var oldParentPath = editor.drag.oldParent.getInternalPath(); var oldParentPath = editor.drag.oldParent.getInternalPath();
var newParentPath = firstNode.parent.getInternalPath(); var newParentPath = firstNode.parent.getInternalPath();
var oldIndex = editor.drag.oldIndex; var oldIndex = editor.drag.oldNextNode.getIndex();
var newIndex = firstNode.getIndex(); var newIndex = firstNode.getIndex();
if (JSON.stringify(oldParentPath) !== JSON.stringify(newParentPath) || oldIndex !== newIndex) { if (JSON.stringify(oldParentPath) !== JSON.stringify(newParentPath) || oldIndex !== newIndex) {
@ -2719,9 +2720,8 @@ Node.prototype.onKeyDown = function (event) {
var prevNode, nextNode, nextDom, nextDom2; var prevNode, nextNode, nextDom, nextDom2;
var editable = this.editor.options.mode === 'tree'; var editable = this.editor.options.mode === 'tree';
var oldSelection; var oldSelection;
var oldBeforeNode; var oldNextNode;
var oldParent; var oldParent;
var oldIndex;
var nodes; var nodes;
var multiselection; var multiselection;
var selectedNodes = this.editor.multiselection.nodes.length > 0 var selectedNodes = this.editor.multiselection.nodes.length > 0
@ -2832,7 +2832,7 @@ Node.prototype.onKeyDown = function (event) {
nextNode2 && nextNode2.parent) { nextNode2 && nextNode2.parent) {
oldSelection = this.editor.getDomSelection(); oldSelection = this.editor.getDomSelection();
oldParent = firstNode.parent; oldParent = firstNode.parent;
oldIndex = firstNode.getIndex(); oldNextNode = oldParent.childs[lastNode.getIndex() + 1] || oldParent.append;
selectedNodes.forEach(function (node) { selectedNodes.forEach(function (node) {
nextNode2.parent.moveBefore(node, nextNode2); nextNode2.parent.moveBefore(node, nextNode2);
@ -2844,7 +2844,7 @@ Node.prototype.onKeyDown = function (event) {
fieldNames: selectedNodes.map(getField), fieldNames: selectedNodes.map(getField),
oldParentPath: oldParent.getInternalPath(), oldParentPath: oldParent.getInternalPath(),
newParentPath: firstNode.parent.getInternalPath(), newParentPath: firstNode.parent.getInternalPath(),
oldIndex: oldIndex, oldIndex: oldNextNode.getIndex(),
newIndex: firstNode.getIndex(), newIndex: firstNode.getIndex(),
oldSelection: oldSelection, oldSelection: oldSelection,
newSelection: this.editor.getDomSelection() newSelection: this.editor.getDomSelection()
@ -2883,7 +2883,7 @@ Node.prototype.onKeyDown = function (event) {
if (prevNode && prevNode.parent) { if (prevNode && prevNode.parent) {
oldSelection = this.editor.getDomSelection(); oldSelection = this.editor.getDomSelection();
oldParent = firstNode.parent; oldParent = firstNode.parent;
oldIndex = firstNode.getIndex(); oldNextNode = oldParent.childs[lastNode.getIndex() + 1] || oldParent.append;
selectedNodes.forEach(function (node) { selectedNodes.forEach(function (node) {
prevNode.parent.moveBefore(node, prevNode); prevNode.parent.moveBefore(node, prevNode);
@ -2895,7 +2895,7 @@ Node.prototype.onKeyDown = function (event) {
fieldNames: selectedNodes.map(getField), fieldNames: selectedNodes.map(getField),
oldParentPath: oldParent.getInternalPath(), oldParentPath: oldParent.getInternalPath(),
newParentPath: firstNode.parent.getInternalPath(), newParentPath: firstNode.parent.getInternalPath(),
oldIndex: oldIndex, oldIndex: oldNextNode.getIndex(),
newIndex: firstNode.getIndex(), newIndex: firstNode.getIndex(),
oldSelection: oldSelection, oldSelection: oldSelection,
newSelection: this.editor.getDomSelection() newSelection: this.editor.getDomSelection()
@ -2921,7 +2921,7 @@ Node.prototype.onKeyDown = function (event) {
if (prevNode && prevNode.parent && !prevNode.isVisible()) { if (prevNode && prevNode.parent && !prevNode.isVisible()) {
oldSelection = this.editor.getDomSelection(); oldSelection = this.editor.getDomSelection();
oldParent = firstNode.parent; oldParent = firstNode.parent;
oldIndex = firstNode.getIndex(); oldNextNode = oldParent.childs[lastNode.getIndex() + 1] || oldParent.append;
selectedNodes.forEach(function (node) { selectedNodes.forEach(function (node) {
prevNode.parent.moveBefore(node, prevNode); prevNode.parent.moveBefore(node, prevNode);
@ -2933,7 +2933,7 @@ Node.prototype.onKeyDown = function (event) {
fieldNames: selectedNodes.map(getField), fieldNames: selectedNodes.map(getField),
oldParentPath: oldParent.getInternalPath(), oldParentPath: oldParent.getInternalPath(),
newParentPath: firstNode.parent.getInternalPath(), newParentPath: firstNode.parent.getInternalPath(),
oldIndex: oldIndex, oldIndex: oldNextNode.getIndex(),
newIndex: firstNode.getIndex(), newIndex: firstNode.getIndex(),
oldSelection: oldSelection, oldSelection: oldSelection,
newSelection: this.editor.getDomSelection() newSelection: this.editor.getDomSelection()
@ -2988,7 +2988,7 @@ Node.prototype.onKeyDown = function (event) {
if (nextNode2 && nextNode2.parent) { if (nextNode2 && nextNode2.parent) {
oldSelection = this.editor.getDomSelection(); oldSelection = this.editor.getDomSelection();
oldParent = firstNode.parent; oldParent = firstNode.parent;
oldIndex = firstNode.getIndex(); oldNextNode = oldParent.childs[lastNode.getIndex() + 1] || oldParent.append;
selectedNodes.forEach(function (node) { selectedNodes.forEach(function (node) {
nextNode2.parent.moveBefore(node, nextNode2); nextNode2.parent.moveBefore(node, nextNode2);
@ -3000,7 +3000,7 @@ Node.prototype.onKeyDown = function (event) {
fieldNames: selectedNodes.map(getField), fieldNames: selectedNodes.map(getField),
oldParentPath: oldParent.getInternalPath(), oldParentPath: oldParent.getInternalPath(),
newParentPath: firstNode.parent.getInternalPath(), newParentPath: firstNode.parent.getInternalPath(),
oldIndex: oldIndex, oldIndex: oldNextNode.getIndex(),
newIndex: firstNode.getIndex(), newIndex: firstNode.getIndex(),
oldSelection: oldSelection, oldSelection: oldSelection,
newSelection: this.editor.getDomSelection() newSelection: this.editor.getDomSelection()