removed last global keyboard handlers

This commit is contained in:
zadam
2020-01-22 20:48:56 +01:00
parent 370c63986d
commit 11a61325f9
9 changed files with 69 additions and 78 deletions

View File

@@ -10,6 +10,8 @@ class BasicWidget extends Component {
$widget.find("[data-trigger-event]").on('click', e => {
const eventName = $(e.target).attr('data-trigger-event');
console.log("Triggering " + eventName);
this.appContext.trigger(eventName);
});

View File

@@ -29,7 +29,7 @@ const TPL = `
<span class="caret"></span>
</button>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item options-button">
<a class="dropdown-item options-button" data-trigger-event="showOptions">
<span class="bx bx-slider"></span>
Options
</a>
@@ -45,38 +45,38 @@ const TPL = `
<kbd data-kb-action="OpenDevTools"></kbd>
</a>
<a class="dropdown-item open-sql-console-button" data-trigger-event="showSQLConsole">
<a class="dropdown-item" data-trigger-event="showSQLConsole">
<span class="bx bx-data"></span>
Open SQL Console
<kbd data-kb-action="ShowSQLConsole"></kbd>
</a>
<a class="dropdown-item show-backend-log-button" data-trigger-event="showBackendLog">
<a class="dropdown-item" data-trigger-event="showBackendLog">
<span class="bx bx-empty"></span>
Show backend log
<kbd data-kb-action="ShowBackendLog"></kbd>
</a>
<a class="dropdown-item reload-frontend-button" data-trigger-event="reloadFrontendApp"
<a class="dropdown-item" data-trigger-event="reloadFrontendApp"
title="Reload can help with some visual glitches without restarting the whole app.">
<span class="bx bx-empty"></span>
Reload frontend
<kbd data-kb-action="ReloadFrontendApp"></kbd>
</a>
<a class="dropdown-item toggle-zen-mode-button" data-trigger-event="toggleZenMode">
<a class="dropdown-item" data-trigger-event="toggleZenMode">
<span class="bx bx-empty"></span>
Toggle Zen mode
<kbd data-kb-action="ToggleZenMode"></kbd>
</a>
<a class="dropdown-item toggle-fullscreen-button" data-trigger-event="toggleFullscreen">
<a class="dropdown-item" data-trigger-event="toggleFullscreen">
<span class="bx bx-empty"></span>
Toggle fullscreen
<kbd data-kb-action="ToggleFullscreen"></kbd>
</a>
<a class="dropdown-item show-help-button" data-trigger-event="showHelp">
<a class="dropdown-item" data-trigger-event="showHelp">
<span class="bx bx-info-circle"></span>
Show Help
<kbd data-kb-action="ShowHelp"></kbd>
@@ -97,7 +97,7 @@ const TPL = `
`;
export default class GlobalMenuWidget extends BasicWidget {
render() {
doRender() {
this.$widget = $(TPL);
this.$widget.find(".show-about-dialog-button").on('click',

View File

@@ -17,7 +17,7 @@ const TPL = `
`;
export default class HistoryNavigationWidget extends BasicWidget {
render() {
doRender() {
if (!utils.isElectron()) {
return;
}

View File

@@ -1,4 +1,3 @@
import BasicWidget from "./basic_widget.js";
import hoistedNoteService from "../services/hoisted_note.js";
import searchNotesService from "../services/search_notes.js";
import treeService from "../services/tree.js";
@@ -34,6 +33,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
constructor(appContext) {
super(appContext);
window.glob.cutIntoNote = () => this.cutIntoNoteListener();
this.tree = null;
}
@@ -453,4 +454,41 @@ export default class NoteTreeWidget extends TabAwareWidget {
treeService.setNodeTitleWithPrefix(node);
}
}
async createNoteAfterListener() {
const node = this.getActiveNode();
const parentNoteId = node.data.parentNoteId;
const isProtected = await treeUtils.getParentProtectedStatus(node);
if (node.data.noteId === 'root' || node.data.noteId === await hoistedNoteService.getHoistedNoteId()) {
return;
}
await treeService.createNote(node, parentNoteId, 'after', {
isProtected: isProtected,
saveSelection: true
});
}
async createNoteIntoListener() {
const node = this.getActiveNode();
if (node) {
await treeService.createNote(node, node.data.noteId, 'into', {
isProtected: node.data.isProtected,
saveSelection: false
});
}
}
async cutIntoNoteListener() {
const node = this.getActiveNode();
if (node) {
await treeService.createNote(node, node.data.noteId, 'into', {
isProtected: node.data.isProtected,
saveSelection: true
});
}
}
}

View File

@@ -64,7 +64,7 @@ const TPL = `
</div>`;
export default class StandardTopWidget extends BasicWidget {
render() {
doRender() {
this.$widget = $(TPL);
const historyNavigationWidget = new HistoryNavigationWidget(this.appContext);

View File

@@ -18,7 +18,7 @@ const TPL = `
</div>`;
export default class TitleBarButtonsWidget extends BasicWidget {
render() {
doRender() {
if (!utils.isElectron()) {
return;
}