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

Merge branch 'master' into validation

Browse Source
This commit is contained in:
Quincy Morgan
2018-12-20 13:58:09 -05:00
parent d7ef2de073 7c192a2e36
commit 373be68294
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/field.js
+11 -13
View File
@@ -246,20 +246,18 @@ export function uiField(context, presetField, entity, options) {
}
var prerequisiteTag = field.prerequisiteTag;
if (prerequisiteTag && field.entityID) {
if (prerequisiteTag.key) {
var value = context.graph().entity(field.entityID).tags[prerequisiteTag.key];
if (value) {
if (prerequisiteTag.valueNot) {
return prerequisiteTag.valueNot !== value;
}
if (prerequisiteTag.value) {
return prerequisiteTag.value === value;
}
return true;
} else {
return false;
if (prerequisiteTag && prerequisiteTag.key && field.entityID && context.hasEntity(field.entityID)) {
var value = context.entity(field.entityID).tags[prerequisiteTag.key];
if (value) {
if (prerequisiteTag.valueNot) {
return prerequisiteTag.valueNot !== value;
}
if (prerequisiteTag.value) {
return prerequisiteTag.value === value;
}
return true;
} else {
return false;
}
}
return true;