added possibility to search by attached script returning note ids + some refactorings

This commit is contained in:
zadam
2019-03-20 22:28:54 +01:00
parent 9ca680f842
commit fc13e1fa6a
21 changed files with 125 additions and 62 deletions

View File

@@ -16,7 +16,7 @@ async function showDialog() {
$dialog.modal();
const currentNode = treeService.getCurrentNode();
const currentNode = treeService.getActiveNode();
branchId = currentNode.data.branchId;
const branch = await treeCache.getBranch(branchId);

View File

@@ -45,7 +45,7 @@ async function showDialog(defaultType) {
$dialog.modal();
const currentNode = treeService.getCurrentNode();
const currentNode = treeService.getActiveNode();
const noteTitle = await treeUtils.getNoteTitle(currentNode.data.noteId);
$noteTitle.html(noteTitle);
@@ -69,7 +69,7 @@ $form.submit(() => {
const exportVersion = exportFormat === 'opml' ? $dialog.find("input[name='opml-version']:checked").val() : "1.0";
const currentNode = treeService.getCurrentNode();
const currentNode = treeService.getActiveNode();
exportBranch(currentNode.data.branchId, exportType, exportFormat, exportVersion);

View File

@@ -35,14 +35,14 @@ async function showDialog() {
glob.activeDialog = $dialog;
const currentNode = treeService.getCurrentNode();
const currentNode = treeService.getActiveNode();
$noteTitle.text(await treeUtils.getNoteTitle(currentNode.data.noteId));
$dialog.modal();
}
$form.submit(() => {
const currentNode = treeService.getCurrentNode();
const currentNode = treeService.getActiveNode();
// disabling so that import is not triggered again.
$importButton.attr("disabled", "disabled");