Merge branch 'master' into next55

# Conflicts:
#	electron.js
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
#	src/public/app/widgets/note_tree.js
#	src/services/port.js
This commit is contained in:
zadam
2022-10-15 12:09:25 +02:00
112 changed files with 1817 additions and 418 deletions

View File

@@ -162,7 +162,10 @@ async function loadReferenceLinkTitle(noteId, $el) {
title = note.isDeleted ? `${note.title} (deleted)` : note.title;
}
$el.addClass(note.getColorClass());
$el.text(title);
$el.prepend($("<span>").addClass(note.getIcon()));
}
$(document).on('click', "a", goToLink);