CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-06 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Before saving, revert entities where user chose "keep theirs"

Browse Source
This commit is contained in:
Bryan Housel
2015-04-27 10:18:07 -04:00
parent 00c0641f06
commit a565b72f7d
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/id/modes/save.js
View File

@@ -175,6 +175,20 @@ iD.modes.Save = function(context) {
selection.remove();
})
.on('save', function() {
for (var i = 0; i < conflicts.length; i++) {
if (conflicts[i].chosen === 1) { // user chose "keep theirs"
var entity = context.entity(conflicts[i].id);
if (entity.type === 'way') {
var children = _.uniq(entity.nodes);
for (var j = 0; j < children.length; j++) {
var child = context.entity(children[j]);
history.replace(iD.actions.Revert(child));
}
}
history.replace(iD.actions.Revert(entity));
}
}
selection.remove();
save(e, true);
})