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

fixed global create new day note

Browse Source
This commit is contained in:
zadam 2020-03-17 21:39:26 +01:00
parent c3b44b9a91
commit 72cc54a83f
6 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ import bundleService from "./services/bundle.js";
if (utils.isElectron()) {
require('electron').ipcRenderer.on('globalShortcut', async function(event, actionName) {
keyboardActionService.triggerAction(actionName);
appContext.triggerCommand(actionName);
});
}

17
src/public/javascripts/services/entrypoints.js
View File

@ -8,6 +8,7 @@ import appContext from "./app_context.js";
import Component from "../widgets/component.js";
import toastService from "./toast.js";
import noteCreateService from "./note_create.js";
import ws from "./ws.js";
export default class Entrypoints extends Component {
constructor() {
@ -65,18 +66,18 @@ export default class Entrypoints extends Component {
async createNoteIntoDayNoteCommand() {
const todayNote = await dateNoteService.getTodayNote();
const {note} = await server.post(`notes/${todayNote.noteId}/children?target=into`, {
title: 'new note',
content: '',
const {note} = await noteCreateService.createNote(todayNote.noteId, {
isProtected: todayNote.isProtected,
type: 'text',
isProtected: todayNote.isProtected
title: 'new note',
content: ''
});
await treeService.expandToNote(note.noteId);
await ws.waitForMaxKnownSyncId();
const tabContext = await appContext.tabManager.openTabWithNote(note.noteId, true);
await appContext.tabManager.openTabWithNote(note.noteId, false);
appContext.triggerCommand('focusAndSelectTitle');
appContext.triggerEvent('focusAndSelectTitle');
}
async toggleNoteHoistingCommand() {
@ -137,6 +138,7 @@ export default class Entrypoints extends Component {
backInNoteHistoryCommand() {
if (utils.isElectron()) {
// standard JS version does not work completely correctly in electron
const webContents = require('electron').remote.getCurrentWebContents();
const activeIndex = parseInt(webContents.getActiveIndex());
@ -149,6 +151,7 @@ export default class Entrypoints extends Component {
forwardInNoteHistoryCommand() {
if (utils.isElectron()) {
// standard JS version does not work completely correctly in electron
const webContents = require('electron').remote.getCurrentWebContents();
const activeIndex = parseInt(webContents.getActiveIndex());

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

@ -58,7 +58,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
await ws.waitForMaxKnownSyncId();
await appContext.tabManager.getActiveTabContext().setNote(notePath);
appContext.triggerCommand('focusAndSelectTitle');
appContext.triggerEvent('focusAndSelectTitle');
};
/**

12
src/public/javascripts/services/keyboard_actions.js
View File

@ -66,16 +66,6 @@ function setElementActionHandler($el, actionName, handler) {
});
}
async function triggerAction(actionName) {
const action = await getAction(actionName);
if (!action.handler) {
throw new Error(`Action ${actionName} has no handler`);
}
await action.handler();
}
async function getAction(actionName, silent = false) {
await keyboardActionsLoaded;
@ -119,8 +109,6 @@ function updateDisplayedShortcuts($container) {
export default {
setElementActionHandler,
triggerAction,
getAction,
updateDisplayedShortcuts,
setupActionsForElement,
getActionsForScope

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

@ -18,7 +18,7 @@ export default class LoadResults {
this.options = [];
}
addNote(noteId, sourceId) {console.log("Adding", noteId, sourceId);
addNote(noteId, sourceId) {
this.noteIdToSourceId[noteId] = this.noteIdToSourceId[noteId] || [];
if (!this.noteIdToSourceId[noteId].includes(sourceId)) {

2
src/public/javascripts/widgets/note_title.js
View File

@ -70,7 +70,7 @@ export default class NoteTitleWidget extends TabAwareWidget {
}
}
focusAndSelectTitleCommand() {
focusAndSelectTitleEvent() {
if (this.tabContext && this.tabContext.isActive()) {
this.$noteTitle
.trigger('focus')