forked from 0x2620/pandora
rewrite history on join and split (added items will have new ids)
This commit is contained in:
parent
6d13693e58
commit
ca75a1dc94
1 changed files with 10 additions and 4 deletions
|
@ -323,8 +323,8 @@ pandora.createLinks = function($element) {
|
||||||
action: action,
|
action: action,
|
||||||
items: action == 'cut' || action == 'delete' ? [items]
|
items: action == 'cut' || action == 'delete' ? [items]
|
||||||
: action == 'copy' || action == 'paste' ? [addedItems]
|
: action == 'copy' || action == 'paste' ? [addedItems]
|
||||||
: action == 'move' ? [items, addedItems]
|
: action == 'join' || action == 'split' ? [items[0], addedItems]
|
||||||
: [items],
|
: [items, addedItems], // move
|
||||||
positions: [],
|
positions: [],
|
||||||
targets: targets,
|
targets: targets,
|
||||||
text: text
|
text: text
|
||||||
|
@ -350,7 +350,10 @@ pandora.createLinks = function($element) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function done() {
|
function done(result, addedItems) {
|
||||||
|
if (object.action == 'join' || object.action == 'split') {
|
||||||
|
object.items[1] = addedItems;
|
||||||
|
}
|
||||||
doneHistory(object, callback);
|
doneHistory(object, callback);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -372,7 +375,10 @@ pandora.createLinks = function($element) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function done() {
|
function done(result, addedItems) {
|
||||||
|
if (object.action == 'join' || object.action == 'split') {
|
||||||
|
object.items[0] = addedItems;
|
||||||
|
}
|
||||||
doneHistory(object, callback);
|
doneHistory(object, callback);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue