Merge branch 'stable'

# Conflicts:
#	package-lock.json
This commit is contained in:
zadam
2019-06-06 21:24:25 +02:00
6 changed files with 70 additions and 21 deletions

View File

@@ -21,7 +21,7 @@ async function showDialog() {
branchId = currentNode.data.branchId;
const branch = await treeCache.getBranch(branchId);
$treePrefixInput.val(branch.prefix).focus();
$treePrefixInput.val(branch.prefix);
const noteTitle = await treeUtils.getNoteTitle(currentNode.data.noteId);
@@ -46,6 +46,8 @@ $form.submit(() => {
return false;
});
$dialog.on('shown.bs.modal', () => $treePrefixInput.focus());
export default {
showDialog
};