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

Merge branch '2.x' into uploader

Browse Source 
# Conflicts:
#	modules/modes/save.js
This commit is contained in:
Quincy Morgan
2020-02-05 16:23:09 -05:00
parent 0e14241fcf 3b19cc32fd
commit 237a382c51
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/modes/save.js
View File

@@ -65,16 +65,23 @@ export function modeSave(context) {
.append('div')
.attr('class','sidebar-component');
context.container().selectAll('#content')
.attr('class', 'active');
var ui = uiConflicts(context)
.conflictList(conflicts)
.origChanges(origChanges)
.on('cancel', function() {
context.container().selectAll('#content')
.attr('class', 'inactive')
selection.remove();
keybindingOn();
uploader.cancelConflictResolution();
})
.on('save', function() {
context.container().selectAll('#content')
.attr('class', 'inactive');
selection.remove();
uploader.processResolvedConflicts(changeset);