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

Fixed broken preset field inheritance

Browse Source
This commit is contained in:
Quincy Morgan
2019-01-17 09:49:48 -05:00
parent f93ee2f242
commit 9ad217dce3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/presets/preset.js
View File

@@ -61,7 +61,7 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
fieldIDs = fieldIDs.concat(inheritIDs);
} else {
/* eslint-disable no-console */
console.log('Can not resolve presetID ' + match[0] +
console.log('Cannot resolve presetID ' + match[0] +
' found in ' + preset.id + ' ' + prop);
/* eslint-enable no-console */
}
@@ -73,9 +73,14 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
} else { // no fields defined, so use the parent's if possible
fieldIDs = inheritedFieldIDs(preset.parentPresetID(), prop);
}
// resolve duplicate fields
fieldIDs = _uniq(fieldIDs);
// update this preset with the results
preset[prop] = fieldIDs;
// update the raw object to allow for multiple levels of inheritance
rawPresets[preset.id][prop] = _uniq(fieldIDs);
rawPresets[preset.id][prop] = fieldIDs;
});
}