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

fix preserving original sourceId after running script notes, fixes #2224

Browse Source
This commit is contained in:
zadam
2021-10-12 21:41:25 +02:00
parent 1cdd644b8f
commit 6738f2cd24
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -1344,9 +1344,9 @@
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
}, },
"axios": { "axios": {
"version": "0.22.0", "version": "0.23.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-0.23.0.tgz",
"integrity": "sha512-Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w==", "integrity": "sha512-NmvAE4i0YAv5cKq8zlDoPd1VLKAqX5oLuZKs8xkJa4qi6RGn0uhCYFjWtHHC9EM/MwOwYWOs53W+V0aqEXq1sg==",
"requires": { "requires": {
"follow-redirects": "^1.14.4" "follow-redirects": "^1.14.4"
} }

6
src/services/script.js
View File

@@ -30,11 +30,12 @@ function executeBundle(bundle, apiParams = {}) {
apiParams.startNote = bundle.note; apiParams.startNote = bundle.note;
} }
const originalSourceId = cls.get('sourceId');
cls.set('sourceId', 'script'); cls.set('sourceId', 'script');
// last \r\n is necessary if script contains line comment on its last line // last \r\n is necessary if script contains line comment on its last line
const script = "function() {\r\n" + bundle.script + "\r\n}"; const script = "function() {\r\n" + bundle.script + "\r\n}";
const ctx = new ScriptContext(bundle.allNotes, apiParams); const ctx = new ScriptContext(bundle.allNotes, apiParams);
try { try {
@@ -45,6 +46,9 @@ function executeBundle(bundle, apiParams = {}) {
throw e; throw e;
} }
finally {
cls.set('sourceId', originalSourceId);
}
} }
/** /**