gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

CKEditor 21

Browse Source
This commit is contained in:
zadam 2020-07-29 23:34:49 +02:00
parent 8a57960c6e
commit 95bbdb3b6b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

5
src/public/app/services/utils.js
View File

@ -328,6 +328,9 @@ function dynamicRequire(moduleName) {
} }
function timeLimit(promise, limitMs) { function timeLimit(promise, limitMs) {
// better stack trace if created outside of promise
const error = new Error('Process exceeded time limit ' + limitMs);
return new Promise((res, rej) => { return new Promise((res, rej) => {
let resolved = false; let resolved = false;
@ -339,7 +342,7 @@ function timeLimit(promise, limitMs) {
setTimeout(() => { setTimeout(() => {
if (!resolved) { if (!resolved) {
rej(new Error('Process exceeded time limit ' + limitMs)); rej(error);
} }
}, limitMs); }, limitMs);
}); });