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

Merge branch 'master' into m41

Browse Source 
# Conflicts:
#	src/public/javascripts/dialogs/add_link.js
#	src/public/javascripts/dialogs/export.js
#	src/public/javascripts/dialogs/import.js
#	src/public/javascripts/dialogs/note_info.js
#	src/public/javascripts/services/search_notes.js
This commit is contained in:
zadam
2020-02-09 18:54:56 +01:00
parent 4ec671d199 4ce4ac9584
commit 4401a8e1e8
32 changed files with 135 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/javascripts/dialogs/link_map.js
View File

@@ -16,10 +16,6 @@ function getOptions() {
}
export async function showDialog() {
utils.closeActiveDialog();
glob.activeDialog = $dialog;
// set default settings
$maxNotesInput.val(20);
@@ -27,7 +23,7 @@ export async function showDialog() {
$linkMapContainer.empty();
$dialog.modal();
utils.openDialog($dialog);
}
$dialog.on('shown.bs.modal', () => {