Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

mobile frontend fixes

Browse Source
This commit is contained in:
zadam
2021-06-03 21:47:25 +02:00
parent 5e5df72020
commit ac04be4433
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "trilium",
"version": "0.47.3",
"version": "0.47.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -885,7 +885,7 @@
},
"@webassemblyjs/helper-wasm-section": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-ribbon-1.11.0.tgz",
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
"integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
"dev": true,
"requires": {

20
src/routes/api/notes.js
View File

@@ -18,23 +18,25 @@ function getNote(req) {
return [404, "Note " + noteId + " has not been found."];
}
if (note.isStringNote()) {
note.content = note.getContent();
const pojo = note.getPojo();
if (note.type === 'file' && note.content.length > 10000) {
note.content = note.content.substr(0, 10000)
+ `\r\n\r\n... and ${note.content.length - 10000} more characters.`;
if (note.isStringNote()) {
pojo.content = note.getContent();
if (note.type === 'file' && pojo.content.length > 10000) {
pojo.content = pojo.content.substr(0, 10000)
+ `\r\n\r\n... and ${pojo.content.length - 10000} more characters.`;
}
}
const contentMetadata = note.getContentMetadata();
note.contentLength = contentMetadata.contentLength;
pojo.contentLength = contentMetadata.contentLength;
note.combinedUtcDateModified = note.utcDateModified > contentMetadata.utcDateModified ? note.utcDateModified : contentMetadata.utcDateModified;
note.combinedDateModified = note.utcDateModified > contentMetadata.utcDateModified ? note.dateModified : contentMetadata.dateModified;
pojo.combinedUtcDateModified = note.utcDateModified > contentMetadata.utcDateModified ? note.utcDateModified : contentMetadata.utcDateModified;
pojo.combinedDateModified = note.utcDateModified > contentMetadata.utcDateModified ? note.dateModified : contentMetadata.dateModified;
return note;
return pojo;
}
function createNote(req) {

2
src/views/mobile.ejs
View File

@@ -123,7 +123,7 @@
<script src="libraries/dayjs.min.js"></script>
<link href="libraries/fancytree/skin-win8/ui.fancytree.min.css" rel="stylesheet">
<link href="stylesheets/tree.css" rel="stylesheet">
<script src="libraries/fancytree/jquery.fancytree-all-deps.min.js"></script>
<link href="libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">