cartodb/Backbone.Undo.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The "change" UndoType now rightfully unsets added attributes on undo/redo

Browse Source
This commit is contained in:
Oliver Sartun 2013-10-23 16:39:21 +02:00
parent 65fead3ffa
commit ab20281c58
1 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Backbone.Undo.js
View File

@ -366,28 +366,60 @@
}
},
"change": {
"undo": function (model, before, after) {
"undo": function (model, before, after, options) {
if (_.isEmpty(before)) {
_.each(_.keys(after), model.unset, model);
} else {
model.set(before);
if (options && options.unset && options.unset.before && options.unset.before.length) {
_.each(options.unset.before, model.unset, model);
}
}
},
"redo": function (model, before, after) {
"redo": function (model, before, after, options) {
if (_.isEmpty(after)) {
_.each(_.keys(before), model.unset, model);
} else {
model.set(after);
if (options && options.unset && options.unset.after && options.unset.after.length) {
_.each(options.unset.after, model.unset, model);
}
}
},
"on": function (model, options) {
var
changedAttributes = model.changedAttributes(),
previousAttributes = _.pick(model.previousAttributes(), _.keys(changedAttributes));
afterAttributes = model.changedAttributes(),
keysAfter = _.keys(afterAttributes),
previousAttributes = _.pick(model.previousAttributes(), keysAfter),
keysPrevious = _.keys(previousAttributes),
unset = (options || (options = {})).unset = {
after: [],
before: []
};
if (keysAfter.length != keysPrevious.length) {
// There are new attributes or old attributes have been unset
if (keysAfter.length > keysPrevious.length) {
// New attributes have been added
_.each(keysAfter, function (val) {
if (!(val in previousAttributes)) {
unset.before.push(val);
}
}, this);
} else {
// Old attributes have been unset
_.each(keysPrevious, function (val) {
if (!(val in afterAttributes)) {
unset.after.push(val);
}
})
}
}
return {
object: model,
before: previousAttributes,
after: changedAttributes
after: afterAttributes,
options: _.clone(options)
};
}
},