Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-16 10:15:52 +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/import.js
View File

@@ -16,8 +16,6 @@ const $explodeArchivesCheckbox = $("#explode-archives-checkbox");
let parentNoteId = null;
export async function showDialog(noteId) {
utils.closeActiveDialog();
$fileUploadInput.val('').trigger('change'); // to trigger Import button disabling listener below
$safeImportCheckbox.prop("checked", true);
@@ -26,13 +24,11 @@ export async function showDialog(noteId) {
$codeImportedAsCodeCheckbox.prop("checked", true);
$explodeArchivesCheckbox.prop("checked", true);
glob.activeDialog = $dialog;
parentNoteId = noteId;
$noteTitle.text(await treeService.getNoteTitle(parentNoteId));
$dialog.modal();
utils.openDialog($dialog);
}
$form.on('submit', () => {