Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 09:45:52 +01:00
Code Issues Packages Projects Releases Activity

import & export fixed

Browse Source
This commit is contained in:
zadam
2020-01-21 21:43:23 +01:00
parent 96a7b4e45e
commit 55d1f9e9f0
8 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/public/javascripts/dialogs/export.js
View File

@@ -2,6 +2,7 @@ import treeUtils from "../services/tree_utils.js";
import utils from "../services/utils.js";
import ws from "../services/ws.js";
import toastService from "../services/toast.js";
import treeCache from "../services/tree_cache.js";
const $dialog = $("#export-dialog");
const $form = $("#export-form");
@@ -16,7 +17,7 @@ const $opmlVersions = $("#opml-versions");
let taskId = '';
let branchId = null;
export async function showDialog(node, defaultType) {
export async function showDialog(notePath, defaultType) {
utils.closeActiveDialog();
// each opening of the dialog resets the taskId so we don't associate it with previous exports anymore
@@ -42,9 +43,11 @@ export async function showDialog(node, defaultType) {
$dialog.modal();
branchId = node.data.branchId;
const {noteId, parentNoteId} = treeUtils.getNoteIdAndParentIdFromNotePath(notePath);
const noteTitle = await treeUtils.getNoteTitle(node.data.noteId);
branchId = await treeCache.getBranchId(parentNoteId, noteId);
const noteTitle = await treeUtils.getNoteTitle(noteId);
$noteTitle.html(noteTitle);
}

4
src/public/javascripts/dialogs/import.js
View File

@@ -15,7 +15,7 @@ const $explodeArchivesCheckbox = $("#explode-archives-checkbox");
let parentNoteId = null;
export async function showDialog(node) {
export async function showDialog(noteId) {
utils.closeActiveDialog();
$fileUploadInput.val('').trigger('change'); // to trigger Import button disabling listener below
@@ -28,7 +28,7 @@ export async function showDialog(node) {
glob.activeDialog = $dialog;
parentNoteId = node.data.noteId;
parentNoteId = noteId;
$noteTitle.text(await treeUtils.getNoteTitle(parentNoteId));