Merge branch 'stable'

zadam · zadam · commit 84feec2e7ee0 · 2024-03-28T07:26:17.000+01:00
# Conflicts:
#	package-lock.json
diff --git a/libraries/ckeditor/ckeditor.js b/libraries/ckeditor/ckeditor.js
diff --git a/libraries/ckeditor/ckeditor.js.map b/libraries/ckeditor/ckeditor.js.map
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.63.3",
+  "version": "0.63.5",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
diff --git a/src/becca/entities/battachment.js b/src/becca/entities/battachment.js
@@ -8,7 +8,8 @@ const protectedSessionService = require('../../services/protected_session.js');
 const log = require('../../services/log.js');
 
 const attachmentRoleToNoteTypeMapping = {
-    'image': 'image'
+    'image': 'image',
+    'file': 'file'
 };
 
 /**
diff --git a/src/public/app/services/utils.js b/src/public/app/services/utils.js
@@ -487,12 +487,14 @@ function areObjectsEqual () {
 }
 
 function copyHtmlToClipboard(content) {
-    const clipboardItem = new ClipboardItem({
-        'text/html': new Blob([content], {type: 'text/html'}),
-        'text/plain': new Blob([content], {type: 'text/plain'})
-    });
-
-    navigator.clipboard.write([clipboardItem]);
+    function listener(e) {
+        e.clipboardData.setData("text/html", content);
+        e.clipboardData.setData("text/plain", content);
+        e.preventDefault();
+    }
+    document.addEventListener("copy", listener);
+    document.execCommand("copy");
+    document.removeEventListener("copy", listener);
 }
 
 /**
diff --git a/src/services/build.js b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2024-03-03T06:58:18+01:00", buildRevision: "0ad337c8e806ba84d48d7b97aa46df52d9f236a8" };
+module.exports = { buildDate:"2024-03-28T07:11:39+01:00", buildRevision: "399458b52f250b22be22d980a78de0b3390d7521" };
diff --git a/src/share/content_renderer.js b/src/share/content_renderer.js
@@ -105,10 +105,10 @@ function renderText(result, note) {
 
         if (result.content.includes(`<span class="math-tex">`)) {
             result.header += `
-<script src="../../${assetPath}/node_modules/katex/dist/katex.min.js"></script>
-<link rel="stylesheet" href="../../${assetPath}/node_modules/katex/dist/katex.min.css">
-<script src="../../${assetPath}/node_modules/katex/dist/contrib/auto-render.min.js"></script>
-<script src="../../${assetPath}/node_modules/katex/dist/contrib/mhchem.min.js"></script>
+<script src="../${assetPath}/node_modules/katex/dist/katex.min.js"></script>
+<link rel="stylesheet" href="../${assetPath}/node_modules/katex/dist/katex.min.css">
+<script src="../${assetPath}/node_modules/katex/dist/contrib/auto-render.min.js"></script>
+<script src="../${assetPath}/node_modules/katex/dist/contrib/mhchem.min.js"></script>
 <script>
 document.addEventListener("DOMContentLoaded", function() {
     renderMathInElement(document.getElementById('content'));

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-module.exports = { buildDate:"2024-03-03T06:58:18+01:00", buildRevision: "0ad337c8e806ba84d48d7b97aa46df52d9f236a8" };`
	`1`	`+module.exports = { buildDate:"2024-03-28T07:11:39+01:00", buildRevision: "399458b52f250b22be22d980a78de0b3390d7521" };`