0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

rewrite history on join and split (added items will have new ids)

Browse source
This commit is contained in:
rolux 2013-08-09 16:42:41 +00:00
parent 6d13693e58
commit ca75a1dc94
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
static/js/utils.js
View file

@ -323,8 +323,8 @@ pandora.createLinks = function($element) {
action: action,
items: action == 'cut' || action == 'delete' ? [items]
: action == 'copy' || action == 'paste' ? [addedItems]
: action == 'move' ? [items, addedItems]
: [items],
: action == 'join' || action == 'split' ? [items[0], addedItems]
: [items, addedItems], // move
positions: [],
targets: targets,
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);
}
};
@ -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);
}
};