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

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	db/demo.zip
#	src/services/notes.js
#	src/services/request.js
This commit is contained in:
zadam
2020-08-10 23:45:17 +02:00
parent e663d7da1b 3b148eb6f8
commit 8d0df6ddb9
15 changed files with 210 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,9 @@ function getNote(req) {
if (note.isStringNote()) {
note.content = note.getContent();
if (note.type === 'file') {
note.content = note.content.substr(0, 10000);
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.`;
}
}