all access to notes and branches is now async so we can lazy load it in the future

This commit is contained in:
azivner
2018-03-25 14:49:20 -04:00
parent 297a2cd9da
commit 54e4f54678
11 changed files with 98 additions and 76 deletions

View File

@@ -1,4 +1,5 @@
import treeService from '../services/tree.js';
import server from '../services/server.js';
const $dialog = $("#edit-tree-prefix-dialog");
const $form = $("#edit-tree-prefix-form");
@@ -18,9 +19,9 @@ async function showDialog() {
const currentNode = treeService.getCurrentNode();
branchId = currentNode.data.branchId;
const nt = treeService.getBranch(branchId);
const branch = await treeService.getBranch(branchId);
$treePrefixInput.val(nt.prefix).focus();
$treePrefixInput.val(branch.prefix).focus();
const noteTitle = treeService.getNoteTitle(currentNode.data.noteId);

View File

@@ -1,5 +1,6 @@
import linkService from '../services/link.js';
import utils from '../services/utils.js';
import server from '../services/server.js';
const $dialog = $("#event-log-dialog");
const $list = $("#event-log-list");

View File

@@ -1,5 +1,6 @@
import noteDetailService from '../services/note_detail.js';
import utils from '../services/utils.js';
import server from '../services/server.js';
const $showDialogButton = $(".show-labels-button");
const $dialog = $("#labels-dialog");

View File

@@ -1,5 +1,6 @@
import noteDetailService from '../services/note_detail.js';
import utils from '../services/utils.js';
import server from '../services/server.js';
const $showDialogButton = $("#show-history-button");
const $dialog = $("#note-history-dialog");

View File

@@ -1,5 +1,6 @@
import linkService from '../services/link.js';
import utils from '../services/utils.js';
import server from '../services/server.js';
const $showDialogButton = $("#recent-changes-button");
const $dialog = $("#recent-changes-dialog");

View File

@@ -26,7 +26,7 @@ function addRecentNote(branchId, notePath) {
}, 1500);
}
function showDialog() {
async function showDialog() {
glob.activeDialog = $dialog;
$dialog.dialog({
@@ -40,25 +40,28 @@ function showDialog() {
// remove the current note
const recNotes = list.filter(note => note !== treeService.getCurrentNotePath());
const items = [];
for (const notePath of recNotes) {
let noteTitle;
try {
noteTitle = await treeService.getNotePathTitle(notePath);
}
catch (e) {
noteTitle = "[error - can't find note title]";
messagingService.logError("Could not find title for notePath=" + notePath + ", stack=" + e.stack);
}
items.push({
label: noteTitle,
value: notePath
});
}
$searchInput.autocomplete({
source: recNotes.map(notePath => {
let noteTitle;
try {
noteTitle = treeService.getNotePathTitle(notePath);
}
catch (e) {
noteTitle = "[error - can't find note title]";
messagingService.logError("Could not find title for notePath=" + notePath + ", stack=" + e.stack);
}
return {
label: noteTitle,
value: notePath
}
}),
source: items,
minLength: 0,
autoFocus: true,
select: function (event, ui) {

View File

@@ -1,4 +1,5 @@
import utils from '../services/utils.js';
import server from '../services/server.js';
const $dialog = $("#sql-console-dialog");
const $query = $('#sql-console-query');