gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

make frontendStartup event deterministic after the tree and tabs are loaded, fixes #543

Browse Source
This commit is contained in:
zadam 2019-05-29 21:10:28 +02:00
parent bb43014230
commit 890c00d4ba
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/desktop.js
View File

@ -160,8 +160,6 @@ entrypoints.registerEntrypoints();
noteTooltipService.setupGlobalTooltip(); noteTooltipService.setupGlobalTooltip();
bundle.executeStartupBundles();
linkService.init(); linkService.init();
noteAutocompleteService.init(); noteAutocompleteService.init();

9
src/public/javascripts/services/tree.js
View File

@ -1,6 +1,5 @@
import contextMenuWidget from './context_menu.js'; import contextMenuWidget from './context_menu.js';
import dragAndDropSetup from './drag_and_drop.js'; import dragAndDropSetup from './drag_and_drop.js';
import linkService from './link.js';
import messagingService from './messaging.js'; import messagingService from './messaging.js';
import noteDetailService from './note_detail.js'; import noteDetailService from './note_detail.js';
import protectedSessionHolder from './protected_session_holder.js'; import protectedSessionHolder from './protected_session_holder.js';
@ -17,12 +16,16 @@ import hoistedNoteService from '../services/hoisted_note.js';
import confirmDialog from "../dialogs/confirm.js"; import confirmDialog from "../dialogs/confirm.js";
import optionsInit from "../services/options_init.js"; import optionsInit from "../services/options_init.js";
import TreeContextMenu from "./tree_context_menu.js"; import TreeContextMenu from "./tree_context_menu.js";
import bundle from "./bundle.js";
const $tree = $("#tree"); const $tree = $("#tree");
const $createTopLevelNoteButton = $("#create-top-level-note-button"); const $createTopLevelNoteButton = $("#create-top-level-note-button");
const $collapseTreeButton = $("#collapse-tree-button"); const $collapseTreeButton = $("#collapse-tree-button");
const $scrollToActiveNoteButton = $("#scroll-to-active-note-button"); const $scrollToActiveNoteButton = $("#scroll-to-active-note-button");
let setFrontendAsLoaded;
const frontendLoaded = new Promise(resolve => { setFrontendAsLoaded = resolve; });
// focused & not active node can happen during multiselection where the node is selected but not activated // focused & not active node can happen during multiselection where the node is selected but not activated
// (its content is not displayed in the detail) // (its content is not displayed in the detail)
function getFocusedNode() { function getFocusedNode() {
@ -362,6 +365,8 @@ async function treeInitialized() {
// previous opening triggered task to save tab changes but these are bogus changes (this is init) // previous opening triggered task to save tab changes but these are bogus changes (this is init)
// so we'll cancel it // so we'll cancel it
noteDetailService.clearOpenTabsTask(); noteDetailService.clearOpenTabsTask();
setFrontendAsLoaded();
} }
let ignoreNextActivationNoteId = null; let ignoreNextActivationNoteId = null;
@ -817,6 +822,8 @@ $collapseTreeButton.click(() => collapseTree());
$createTopLevelNoteButton.click(createNewTopLevelNote); $createTopLevelNoteButton.click(createNewTopLevelNote);
$scrollToActiveNoteButton.click(scrollToActiveNote); $scrollToActiveNoteButton.click(scrollToActiveNote);
frontendLoaded.then(bundle.executeStartupBundles);
export default { export default {
reload, reload,
collapseTree, collapseTree,

2
src/views/details/search.ejs
View File

@ -1,5 +1,5 @@
<div class="note-detail-search note-detail-component"> <div class="note-detail-search note-detail-component">
<div style="display: flex; align-items: center; margin-right: 20px;"> <div style="display: flex; align-items: center; margin-right: 20px; margin-top: 15px;">
<strong>Search string: &nbsp; &nbsp;</strong> <strong>Search string: &nbsp; &nbsp;</strong>
<textarea rows="4" style="width: auto !important; flex-grow: 4" class="search-string form-control"></textarea> <textarea rows="4" style="width: auto !important; flex-grow: 4" class="search-string form-control"></textarea>