Merge remote-tracking branch 'origin/next61' into next61

This commit is contained in:
zadam 2023-07-22 17:48:17 +02:00
commit 3aad0ebc95
2 changed files with 4 additions and 1 deletions

1
package-lock.json generated
View file

@ -5,7 +5,6 @@
"requires": true,
"packages": {
"": {
"name": "trilium",
"version": "0.60.4",
"hasInstallScript": true,
"license": "AGPL-3.0-only",

View file

@ -73,6 +73,10 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
const promotedDefAttrs = note.getPromotedDefinitionAttributes();
const ownedAttributes = note.getOwnedAttributes();
// attrs are not resorted if position changes after the initial load
// promoted attrs are sorted primarily by order of definitions, but with multi-valued promoted attrs
// the order of attributes is important as well
ownedAttributes.sort((a, b) => a.position < b.position ? -1 : 1);
if (promotedDefAttrs.length === 0) {
this.toggleInt(false);