gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

global actions context menu, logout

Browse Source
This commit is contained in:
azivner 2018-12-28 23:57:11 +01:00
parent 458ed1faff
commit 78d9fac1e6
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/services/context_menu.js
View File

@ -6,8 +6,6 @@ function initContextMenu(event, itemContainer, selectContextMenuItem) {
$contextMenuContainer.empty(); $contextMenuContainer.empty();
for (const item of itemContainer.getItems()) { for (const item of itemContainer.getItems()) {
console.log("Adding " + item.title);
if (item.title === '----') { if (item.title === '----') {
$contextMenuContainer.append($("<div>").addClass("dropdown-divider")); $contextMenuContainer.append($("<div>").addClass("dropdown-divider"));
} else { } else {

41
src/public/javascripts/services/mobile.js
View File

@ -90,21 +90,36 @@ $("#note-menu-button").click(async e => {
itemsContainer.enableItem("delete", isNotRoot && parentNote.type !== 'search'); itemsContainer.enableItem("delete", isNotRoot && parentNote.type !== 'search');
contextMenuWidget.initContextMenu(e, itemsContainer, noteContextMenuHandler); contextMenuWidget.initContextMenu(e, itemsContainer, (event, cmd) => {
if (cmd === "delete") {
treeChangesService.deleteNodes([node]);
// move to the tree
togglePanes();
}
else {
throw new Error("Unrecognized command " + cmd);
}
});
}); });
async function noteContextMenuHandler(event, cmd) { $("#global-actions-button").click(async e => {
const node = treeService.getCurrentNode(); const itemsContainer = new ContextMenuItemsContainer([
{title: "Switch to desktop version", cmd: "switch-to-desktop", uiIcon: "computer"},
{title: "Logout", cmd: "log-out", uiIcon: "log-out"}
]);
if (cmd === "delete") { contextMenuWidget.initContextMenu(e, itemsContainer, (event, cmd) => {
treeChangesService.deleteNodes([node]); if (cmd === "switch-to-desktop") {
alert("switch to desktop");
// move to the tree }
togglePanes(); else if (cmd === 'log-out') {
} $("#logout-form").submit();
else { }
throw new Error("Unrecognized command " + cmd); else {
} throw new Error("Unrecognized command " + cmd);
} }
});
});
showTree(); showTree();

4
src/views/mobile.ejs
View File

@ -14,6 +14,8 @@
<a id="collapse-tree-button" title="Collapse note tree. Shortcut ALT+C" class="icon-action jam jam-layers"></a> <a id="collapse-tree-button" title="Collapse note tree. Shortcut ALT+C" class="icon-action jam jam-layers"></a>
<a id="scroll-to-current-note-button" title="Scroll to current note. Shortcut CTRL+." class="icon-action jam jam-download"></a> <a id="scroll-to-current-note-button" title="Scroll to current note. Shortcut CTRL+." class="icon-action jam jam-download"></a>
<a id="global-actions-button" title="Global actions" class="icon-action jam jam-cogs"></a>
</div> </div>
<div id="tree"></div> <div id="tree"></div>
@ -54,6 +56,8 @@
<% include dialogs/protected_session_password.ejs %> <% include dialogs/protected_session_password.ejs %>
<div class="dropdown-menu dropdown-menu-sm" id="context-menu-container"></div> <div class="dropdown-menu dropdown-menu-sm" id="context-menu-container"></div>
<form action="logout" id="logout-form" method="POST" style="display: none;"></form>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">