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

Fixes false error when a preset inherits fields from a preset with no fields

Browse Source
This commit is contained in:
Quincy Morgan
2019-01-17 15:40:42 -05:00
parent e37dbbd3e1
commit bb4d0a9282
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/presets/preset.js
+4 -4
View File
@@ -33,12 +33,12 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
return true;
}
// returns an array of field IDs to inherit from the given presetID
// returns an array of field IDs to inherit from the given presetID, if found
function inheritedFieldIDs(presetID, prop) {
if (!presetID) return [];
if (!presetID) return null;
var inheritPreset = rawPresets[presetID];
if (!inheritPreset) return [];
if (!inheritPreset) return null;
var inheritFieldIDs = inheritPreset[prop] || [];
@@ -57,7 +57,7 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
var match = fieldID.match(/\{(.*)\}/);
if (match !== null) { // presetID wrapped in braces {}
var inheritIDs = inheritedFieldIDs(match[1], prop);
if (inheritIDs.length) {
if (inheritIDs !== null) {
fieldIDs = fieldIDs.concat(inheritIDs);
} else {
/* eslint-disable no-console */