CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 17:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: changes to "download changeset"

Browse Source 
* use original changeset before conflict resolutions
* don't cancel the conflict resolution ui
This commit is contained in:
Bryan Housel
2015-02-16 15:12:42 -05:00
parent 663ed92508
commit 6638f6806e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ iD.modes.Save = function(context) {
function save(e) {
var loading = iD.ui.Loading(context).message(t('save.uploading')).blocking(true),
history = context.history(),
origChanges = history.changes(iD.actions.DiscardTags(history.difference())),
altGraph = iD.Graph(history.base(), true),
modified = _.filter(history.difference().summary(), {changeType: 'modified'}),
toCheck = _.pluck(_.pluck(modified, 'entity'), 'id'),
@@ -178,13 +179,9 @@ iD.modes.Save = function(context) {
.append('a')
.attr('class', 'conflicts-download')
.on('click.download', function() {
var diff = iD.actions.DiscardTags(history.difference()),
changes = history.changes(diff),
data = JXON.stringify(context.connection().osmChangeJXON('CHANGEME', changes)),
var data = JXON.stringify(context.connection().osmChangeJXON('CHANGEME', origChanges)),
win = window.open('data:text/xml,' + encodeURIComponent(data), '_blank');
win.focus();
confirm.remove();
})
.text(t('save.conflict.download_changes'));