mirror of
https://github.com/FoggedLens/iD.git
synced 2026-05-16 13:59:27 +02:00
Merge branch 'master' into ignoring-issues
This commit is contained in:
@@ -201,7 +201,7 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
|
||||
};
|
||||
|
||||
|
||||
preset.removeTags = preset.removeTags || preset.tags || {};
|
||||
preset.removeTags = preset.removeTags || preset.addTags || preset.tags || {};
|
||||
preset.unsetTags = function(tags, geometry) {
|
||||
tags = utilObjectOmit(tags, Object.keys(preset.removeTags));
|
||||
|
||||
|
||||
@@ -361,7 +361,12 @@ export function uiRawTagEditor(context) {
|
||||
if (d.key === '') { // removing the blank row
|
||||
_showBlank = false;
|
||||
content(wrap);
|
||||
|
||||
} else {
|
||||
// remove from indexedKeys too, so that if the user puts it back,
|
||||
// it will be sorted to the end and not back to its original position
|
||||
_indexedKeys = _indexedKeys.filter(function(row) { return row.key !== d.key; });
|
||||
|
||||
_pendingChange = _pendingChange || {};
|
||||
_pendingChange[d.key] = undefined;
|
||||
scheduleChange();
|
||||
|
||||
Reference in New Issue
Block a user