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

Don't commit empty changesets.. (closes #1483)

Browse Source 
instead, silently flush context and return to browse mode
This commit is contained in:
Bryan Housel
2015-04-27 11:37:43 -04:00
parent a565b72f7d
commit cecdc012ee
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,23 +134,30 @@ iD.modes.Save = function(context) {
} else if (errors.length) {
showErrors();
} else {
context.connection().putChangeset(
history.changes(iD.actions.DiscardTags(history.difference())),
e.comment,
history.imageryUsed(),
function(err, changeset_id) {
if (err) {
errors.push({
msg: err.responseText,
details: [ t('save.status_code', { code: err.status }) ]
});
showErrors();
} else {
loading.close();
context.flush();
success(e, changeset_id);
}
});
var changes = history.changes(iD.actions.DiscardTags(history.difference()));
if (changes.modified.length || changes.created.length || changes.deleted.length) {
context.connection().putChangeset(
changes,
e.comment,
history.imageryUsed(),
function(err, changeset_id) {
if (err) {
errors.push({
msg: err.responseText,
details: [ t('save.status_code', { code: err.status }) ]
});
showErrors();
} else {
loading.close();
context.flush();
success(e, changeset_id);
}
});
} else { // changes were insignificant or reverted by user
loading.close();
context.flush();
cancel();
}
}
}