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

Allow presets to inherit multiCombo and semiCombo fields even if they define the preset

Browse Source
This commit is contained in:
Quincy Morgan
2019-02-19 15:48:50 -05:00
parent 6d397e89c6
commit 63caa02cea
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/presets/preset.js
View File

@@ -25,10 +25,14 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
// Skip `fields` for the keys which define the preset.
// These are usually `typeCombo` fields like `shop=*`
function withoutKeyFields(fieldID) {
function shouldInheritFieldWithID(fieldID) {
var f = fields[fieldID];
if (f.key) {
return preset.tags[f.key] === undefined;
if (preset.tags[f.key] !== undefined &&
// inherit anyway if multiple values are allowed
f.type !== 'multiCombo' && f.type !== 'semiCombo') {
return false;
}
}
return true;
}
@@ -43,7 +47,7 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
var inheritFieldIDs = inheritPreset[prop] || [];
if (prop === 'fields') {
inheritFieldIDs = inheritFieldIDs.filter(withoutKeyFields);
inheritFieldIDs = inheritFieldIDs.filter(shouldInheritFieldWithID);
}
return inheritFieldIDs;