Multiple shortcuts for the same action can be separated by comma.
+
+ Multiple shortcuts for the same action can be separated by comma.
+ See Electron documentation for available modifiers and key codes.
+
diff --git a/src/public/app/widgets/note_detail.js b/src/public/app/widgets/note_detail.js
index 0b22dd563..ff45fe55a 100644
--- a/src/public/app/widgets/note_detail.js
+++ b/src/public/app/widgets/note_detail.js
@@ -289,11 +289,15 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
// probably incorrect event
// calling this.refresh() is not enough since the event needs to be propagated to children as well
// FIXME: create a separate event to force hierarchical refresh
- this.triggerEvent('noteTypeMimeChanged', {noteId: this.noteId});
+
+ // this uses handleEvent to make sure that the ordinary content updates are propagated only in the subtree
+ // to avoid problem in #3365
+ this.handleEvent('noteTypeMimeChanged', {noteId: this.noteId});
}
else if (loadResults.isNoteReloaded(this.noteId, this.componentId)
&& (this.type !== await this.getWidgetType() || this.mime !== this.note.mime)) {
+ // this needs to have a triggerEvent so that e.g. note type (not in the component subtree) is updated
this.triggerEvent('noteTypeMimeChanged', {noteId: this.noteId});
}
else {
@@ -310,6 +314,8 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
&& attributeService.isAffecting(attr, this.note));
if (label || relation) {
+ console.log("OOOO");
+
// probably incorrect event
// calling this.refresh() is not enough since the event needs to be propagated to children as well
this.triggerEvent('noteTypeMimeChanged', {noteId: this.noteId});
diff --git a/src/services/build.js b/src/services/build.js
index 58c0c6adb..be85e9eea 100644
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2022-11-20T23:43:38+01:00", buildRevision: "4001953fd76f5ed47f95b66b6089794071a1764a" };
+module.exports = { buildDate:"2022-12-01T22:56:29+01:00", buildRevision: "36c98e919aa5d4bd7da0d4bbdb4d048ea12f53c8" };
diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
index 9e223d46b..d665692a9 100644
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -215,13 +215,13 @@ const DEFAULT_KEYBOARD_ACTIONS = [
},
{
actionName: "activateNextTab",
- defaultShortcuts: isElectron ? ["CommandOrControl+Tab"] : [],
+ defaultShortcuts: isElectron ? ["CommandOrControl+Tab", "CommandOrControl+PageDown"] : [],
description: "Activates tab on the right",
scope: "window"
},
{
actionName: "activatePreviousTab",
- defaultShortcuts: isElectron ? ["CommandOrControl+Shift+Tab"] : [],
+ defaultShortcuts: isElectron ? ["CommandOrControl+Shift+Tab", "CommandOrControl+PageUp"] : [],
description: "Activates tab on the left",
scope: "window"
},
diff --git a/src/services/search/expressions/note_content_fulltext.js b/src/services/search/expressions/note_content_fulltext.js
index 548578c2b..e6c182ed6 100644
--- a/src/services/search/expressions/note_content_fulltext.js
+++ b/src/services/search/expressions/note_content_fulltext.js
@@ -100,7 +100,7 @@ class NoteContentFulltextExp extends Expression {
if (type === 'text' && mime === 'text/html') {
if (!this.raw && content.length < 20000) { // striptags is slow for very large notes
// allow link to preserve URLs: https://github.com/zadam/trilium/issues/2412
- content = striptags(content, ['a']);
+ content = striptags(content, ['a'], ' ');
// at least the closing tag can be easily stripped
content = content.replace(/<\/a>/ig, "");