zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-02-22 14:03:36 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'stable'

Browse source 
# Conflicts:
#	bin/release-flatpack.sh
This commit is contained in:
zadam 2022-08-27 13:19:29 +02:00
commit 7109a12afd
5 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/release-flatpack.sh
View file

@ -26,9 +26,15 @@ if ! git diff-index --quiet HEAD --; then
exit 1 exit 1
fi fi
xmlstarlet ed --inplace --update "/component/releases/release/@version" --value "${VERSION}" --update "/component/releases/release/@date" --value "${VERSION_DATE}" ./trilium-flathub/com.github.zadam.trilium.metainfo.xml flatpak-node-generator npm ../trilium/package-lock.json
yq --inplace "(.modules[0].sources[0].tag = \"v${VERSION}\") | (.modules[0].sources[0].commit = \"${VERSION_COMMIT}\")" ./trilium-flathub/com.github.zadam.trilium.yml xmlstarlet ed --inplace --update "/component/releases/release/@version" --value "${VERSION}" --update "/component/releases/release/@date" --value "${VERSION_DATE}" ./com.github.zadam.trilium.metainfo.xml
yq --inplace "(.modules[0].sources[0].tag = \"v${VERSION}\") | (.modules[0].sources[0].commit = \"${VERSION_COMMIT}\")" ./com.github.zadam.trilium.yml
git add ./generated-sources.json
git add ./com.github.zadam.trilium.metainfo.xml
git add ./com.github.zadam.trilium.yml
git commit -m "release $VERSION" git commit -m "release $VERSION"
git push git push

2
package.json
View file

@ -2,7 +2,7 @@
"name": "trilium", "name": "trilium",
"productName": "Trilium Notes", "productName": "Trilium Notes",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.54.2", "version": "0.54.3",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

8
src/public/app/widgets/attribute_widgets/attribute_editor.js
View file

@ -297,6 +297,12 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
} }
async save() { async save() {
if (this.lastUpdatedNoteId !== this.noteId) {
// https://github.com/zadam/trilium/issues/3090
console.warn("Ignoring blur event because a different note is loaded.");
return;
}
const attributes = this.parseAttributes(); const attributes = this.parseAttributes();
if (attributes) { if (attributes) {
@ -354,6 +360,8 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
} }
dataChanged() { dataChanged() {
this.lastUpdatedNoteId = this.noteId;
if (this.lastSavedContent === this.textEditor.getData()) { if (this.lastSavedContent === this.textEditor.getData()) {
this.$saveAttributesButton.fadeOut(); this.$saveAttributesButton.fadeOut();
} }

5
src/routes/api/tree.js
View file

@ -97,6 +97,11 @@ function getNotesAndBranchesAndAttributes(noteIds) {
for (const attributeId of collectedAttributeIds) { for (const attributeId of collectedAttributeIds) {
const attribute = becca.attributes[attributeId]; const attribute = becca.attributes[attributeId];
if (!attribute) {
log.error(`Could not find attribute for attributeId=${attributeId}`);
continue;
}
attributes.push({ attributes.push({
attributeId: attribute.attributeId, attributeId: attribute.attributeId,
noteId: attribute.noteId, noteId: attribute.noteId,

2
src/services/build.js
View file

@ -1 +1 @@
module.exports = { buildDate:"2022-08-07T23:20:59+02:00", buildRevision: "3a07c5fcc059019a2330a3f6ed204eeb5df1539d" }; module.exports = { buildDate:"2022-08-26T22:16:49+02:00", buildRevision: "e9090b9154f8578fa85f02113bbf4f1050638eb3" };