Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-12 16:25:51 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into next61

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/components/note_context.js
#	src/public/app/services/open.js
#	src/public/app/widgets/buttons/note_actions.js
#	src/public/app/widgets/find_in_code.js
#	src/public/app/widgets/type_widgets/canvas.js
#	src/services/options.js
This commit is contained in:
zadam
2023-05-20 20:55:57 +02:00
parent 1f8798d7ac 7fc2824325
commit 9e9fb2979f
18 changed files with 122 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/options.js
View File

@@ -29,13 +29,17 @@ function getOption(name) {
/**
* @returns {integer}
*/
function getOptionInt(name) {
function getOptionInt(name, defaultValue = undefined) {
const val = getOption(name);
const intVal = parseInt(val);
if (isNaN(intVal)) {
throw new Error(`Could not parse '${val}' into integer for option '${name}'`);
if (defaultValue === undefined) {
throw new Error(`Could not parse '${val}' into integer for option '${name}'`);
} else {
return defaultValue;
}
}
return intVal;