Merge remote-tracking branch 'origin/stable'

This commit is contained in:
zadam
2020-09-30 22:50:33 +02:00
41 changed files with 2438 additions and 2843 deletions

View File

@@ -92,7 +92,18 @@ class Note {
}
}
this.attributeCache = parentAttributes.concat(templateAttributes);
this.attributeCache = [];
const addedAttributeIds = new Set();
for (const attr of parentAttributes.concat(templateAttributes)) {
if (!addedAttributeIds.has(attr.attributeId)) {
addedAttributeIds.add(attr.attributeId);
this.attributeCache.push(attr);
}
}
this.inheritableAttributeCache = [];
for (const attr of this.attributeCache) {