Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

revert: accidental changes after merge

Browse Source
This commit is contained in:
Elian Doran
2025-01-31 09:41:53 +02:00
parent c6bbc284aa
commit 0dd91ad737
6 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "trilium",
"version": "0.91.4-beta",
"version": "0.91.5",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "trilium",
"version": "0.91.4-beta",
"version": "0.91.5",
"license": "AGPL-3.0-only",
"dependencies": {
"@braintree/sanitize-url": "7.1.1",
@@ -86,7 +86,7 @@
"sanitize-filename": "1.6.3",
"sanitize-html": "2.14.0",
"sax": "1.4.1",
"semver": "7.6.3",
"semver": "7.7.0",
"serve-favicon": "2.5.0",
"session-file-store": "1.5.0",
"source-map-support": "0.5.21",
@@ -152,7 +152,7 @@
"@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.0.4",
"cross-env": "7.0.3",
"electron": "34.0.1",
"electron": "34.0.2",
"esm": "3.2.25",
"jasmine": "5.5.0",
"jsdoc": "4.0.4",
@@ -7646,9 +7646,9 @@
}
},
"node_modules/electron": {
"version": "34.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-34.0.1.tgz",
"integrity": "sha512-aArw5tAM80i3CKwEREnyZSM1SkARf5Jd1yBMTIdOL4pB1M+p/oDeyWSFI9Dl+vujyfJKiK4SS5+j19wna1onMw==",
"version": "34.0.2",
"resolved": "https://registry.npmjs.org/electron/-/electron-34.0.2.tgz",
"integrity": "sha512-u3F+DSUlg9NaGS+9qnYmSRN8VjAnc3LJDDk1ye1uISJnh4gjG76y3681qLowsPMx4obvCP2eBINnmbLo0yT5WA==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
@@ -8162,9 +8162,9 @@
}
},
"node_modules/electron/node_modules/@types/node": {
"version": "20.17.14",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.14.tgz",
"integrity": "sha512-w6qdYetNL5KRBiSClK/KWai+2IMEJuAj+EujKCumalFOwXtvOXaEan9AuwcRID2IcOIAWSIfR495hBtgKlx2zg==",
"version": "20.17.16",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.16.tgz",
"integrity": "sha512-vOTpLduLkZXePLxHiHsBLp98mHGnl8RptV4YAO3HfKO5UHjDvySGbxKtpYfy8Sx5+WKcgc45qNreJJRVM3L6mw==",
"license": "MIT",
"dependencies": {
"undici-types": "~6.19.2"
@@ -14724,9 +14724,9 @@
}
},
"node_modules/semver": {
"version": "7.6.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
"version": "7.7.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
"integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"

6
package.json
View File

@@ -2,7 +2,7 @@
"name": "trilium",
"productName": "TriliumNext Notes",
"description": "Build your personal knowledge base with TriliumNext Notes",
"version": "0.91.4-beta",
"version": "0.91.5",
"license": "AGPL-3.0-only",
"main": "./dist/electron-main.js",
"author": {
@@ -131,7 +131,7 @@
"sanitize-filename": "1.6.3",
"sanitize-html": "2.14.0",
"sax": "1.4.1",
"semver": "7.6.3",
"semver": "7.7.0",
"serve-favicon": "2.5.0",
"session-file-store": "1.5.0",
"source-map-support": "0.5.21",
@@ -194,7 +194,7 @@
"@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.0.4",
"cross-env": "7.0.3",
"electron": "34.0.1",
"electron": "34.0.2",
"esm": "3.2.25",
"jasmine": "5.5.0",
"jsdoc": "4.0.4",

6
src/public/app/widgets/ribbon_widgets/classic_editor_toolbar.ts
View File

@@ -119,10 +119,8 @@ export default class ClassicEditorToolbar extends NoteContextAwareWidget {
#adjustPosition() {
let bottom = window.innerHeight - (window.visualViewport?.height || 0);
if (bottom === 0) {
// The keyboard is not visible, align it to the launcher bar instead.
bottom = document.getElementById("mobile-bottom-bar")?.offsetHeight || 0;
}
// When the keyboard is not visible, align it to the launcher bar instead.
bottom = Math.max(bottom, document.getElementById("mobile-bottom-bar")?.offsetHeight || 0);
this.$widget.css("bottom", `${bottom}px`);
}

3
src/share/content_renderer.ts
View File

@@ -4,6 +4,7 @@ import assetPath from "../services/asset_path.js";
import shareRoot from "./share_root.js";
import escapeHtml from "escape-html";
import type SNote from "./shaca/entities/snote.js";
import { t } from "i18next";
/**
* Represents the output of the content renderer.
@@ -43,7 +44,7 @@ function getContent(note: SNote) {
} else if (note.type === "book") {
result.isEmpty = true;
} else {
result.content = "<p>This note type cannot be displayed.</p>";
result.content = `<p>${t("content_renderer.note-cannot-be-displayed")}</p>`;
}
return result;

3
translations/en/server.json
View File

@@ -250,5 +250,8 @@
"backend_log": {
"log-does-not-exist": "The backend log file '{{ fileName }}' does not exist (yet).",
"reading-log-failed": "Reading the backend log file '{{ fileName }}' failed."
},
"content_renderer": {
"note-cannot-be-displayed": "This note type cannot be displayed."
}
}

3
translations/ro/server.json
View File

@@ -251,5 +251,8 @@
},
"geo-map": {
"create-child-note-instruction": "Clic pe hartă pentru a crea o nouă notiță la acea poziție sau apăsați Escape pentru a renunța."
},
"content_renderer": {
"note-cannot-be-displayed": "Acest tip de notiță nu poate fi afișat."
}
}