zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-20 23:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix tree loading on mobile interface, closes #839

Browse source
This commit is contained in:
zadam 2020-02-01 10:04:18 +01:00
parent bd8c078fb9
commit 1a49894adf
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/public/javascripts/mobile.js
View file

@ -87,6 +87,8 @@ async function showTree() {
});
}
});
treeService.setTree($.ui.fancytree.getTree("#tree"));
}
$detail.on("click", ".note-menu-button", async e => {

5
src/public/javascripts/services/sidebar.js
View file

@ -5,6 +5,7 @@ import splitService from "./split.js";
import optionService from "./options.js";
import server from "./server.js";
import noteDetailService from "./note_detail.js";
import utils from "./utils.js";
const $sidebar = $("#right-pane");
const $sidebarContainer = $('#sidebar-container');
@ -15,6 +16,10 @@ const $hideSidebarButton = $("#hide-sidebar-button");
optionService.waitForOptions().then(options => toggleSidebar(options.is('rightPaneVisible')));
function toggleSidebar(show) {
if (utils.isMobile()) {
return;
}
$sidebar.toggle(show);
$showSidebarButton.toggle(!show);
$hideSidebarButton.toggle(show);

7
src/public/javascripts/services/tree.js
View file

@ -913,6 +913,10 @@ function getNodeByKey(key) {
return tree.getNodeByKey(key);
}
function setTree(treeInstance) {
tree = treeInstance;
}
keyboardActionService.setGlobalActionHandler('CollapseTree', () => collapseTree()); // don't use shortened form since collapseTree() accepts argument
$collapseTreeButton.on('click', () => collapseTree());
@ -949,5 +953,6 @@ export default {
focusTree,
scrollToActiveNote,
duplicateNote,
getNodeByKey
getNodeByKey,
setTree
};