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

Merge pull request #3 from Infowatch/master

Browse Source 
hot fix collision with native backbone unset option #2
This commit is contained in:
Oliver Sartun 2014-01-11 04:23:20 -08:00
commit 5186f4e30e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Backbone.Undo.js
View File

@ -377,8 +377,8 @@
_.each(_.keys(after), model.unset, model); _.each(_.keys(after), model.unset, model);
} else { } else {
model.set(before); model.set(before);
if (options && options.unset && options.unset.before && options.unset.before.length) { if (options && options.unsetData && options.unsetData.before && options.unsetData.before.length) {
_.each(options.unset.before, model.unset, model); _.each(options.unsetData.before, model.unset, model);
} }
} }
}, },
@ -387,8 +387,8 @@
_.each(_.keys(before), model.unset, model); _.each(_.keys(before), model.unset, model);
} else { } else {
model.set(after); model.set(after);
if (options && options.unset && options.unset.after && options.unset.after.length) { if (options && options.unsetData && options.unsetData.after && options.unsetData.after.length) {
_.each(options.unset.after, model.unset, model); _.each(options.unsetData.after, model.unset, model);
} }
} }
}, },
@ -398,7 +398,7 @@
keysAfter = _.keys(afterAttributes), keysAfter = _.keys(afterAttributes),
previousAttributes = _.pick(model.previousAttributes(), keysAfter), previousAttributes = _.pick(model.previousAttributes(), keysAfter),
keysPrevious = _.keys(previousAttributes), keysPrevious = _.keys(previousAttributes),
unset = (options || (options = {})).unset = { unsetData = (options || (options = {})).unsetData = {
after: [], after: [],
before: [] before: []
}; };
@ -409,14 +409,14 @@
// New attributes have been added // New attributes have been added
_.each(keysAfter, function (val) { _.each(keysAfter, function (val) {
if (!(val in previousAttributes)) { if (!(val in previousAttributes)) {
unset.before.push(val); unsetData.before.push(val);
} }
}, this); }, this);
} else { } else {
// Old attributes have been unset // Old attributes have been unset
_.each(keysPrevious, function (val) { _.each(keysPrevious, function (val) {
if (!(val in afterAttributes)) { if (!(val in afterAttributes)) {
unset.after.push(val); unsetData.after.push(val);
} }
}) })
} }