@@ -57,7 +58,8 @@ const typeWidgetClasses = {
'protected-session': ProtectedSessionTypeWidget,
'book': BookTypeWidget,
'note-map': NoteMapTypeWidget,
- 'web-view': WebViewTypeWidget
+ 'web-view': WebViewTypeWidget,
+ 'doc': DocTypeWidget
};
export default class NoteDetailWidget extends NoteContextAwareWidget {
@@ -195,6 +197,10 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
type = 'editable-code';
}
+ if (type === 'shortcut') {
+ type = 'doc';
+ }
+
if (note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable()) {
type = 'protected-session';
}
diff --git a/src/public/app/widgets/note_title.js b/src/public/app/widgets/note_title.js
index 030ec4578..722e88b7c 100644
--- a/src/public/app/widgets/note_title.js
+++ b/src/public/app/widgets/note_title.js
@@ -72,7 +72,8 @@ export default class NoteTitleWidget extends NoteContextAwareWidget {
async refreshWithNote(note) {
this.$noteTitle.val(note.title);
- this.$noteTitle.prop("readonly", note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable());
+ this.$noteTitle.prop("readonly", (note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable())
+ || ["lb_root", "lb_availableshortcuts", "lb_visibleshortcuts"].includes(note.noteId));
this.setProtectedStatus(note);
}
diff --git a/src/public/app/widgets/note_type.js b/src/public/app/widgets/note_type.js
index 76fc1be3b..60c979973 100644
--- a/src/public/app/widgets/note_type.js
+++ b/src/public/app/widgets/note_type.js
@@ -8,6 +8,7 @@ const NOTE_TYPES = [
{ type: "image", title: "Image", selectable: false },
{ type: "search", title: "Saved Search", selectable: false },
{ type: "note-map", mime: '', title: "Note Map", selectable: false },
+ { type: "shortcut", mime: '', title: "Shortcut", selectable: false },
{ type: "text", mime: "text/html", title: "Text", selectable: true },
{ type: "relation-map", mime: "application/json", title: "Relation Map", selectable: true },
diff --git a/src/public/app/widgets/type_widgets/doc.js b/src/public/app/widgets/type_widgets/doc.js
new file mode 100644
index 000000000..9410c443f
--- /dev/null
+++ b/src/public/app/widgets/type_widgets/doc.js
@@ -0,0 +1,13 @@
+import TypeWidget from "./type_widget.js";
+
+const TPL = `
Z
`;
+
+export default class DocTypeWidget extends TypeWidget {
+ static getType() { return "doc"; }
+
+ doRender() {
+ this.$widget = $(TPL);
+
+ super.doRender();
+ }
+}
diff --git a/src/services/handlers.js b/src/services/handlers.js
index f4916437e..8153695ae 100644
--- a/src/services/handlers.js
+++ b/src/services/handlers.js
@@ -4,6 +4,8 @@ const treeService = require('./tree');
const noteService = require('./notes');
const becca = require('../becca/becca');
const Attribute = require('../becca/entities/attribute');
+const debounce = require('debounce');
+const specialNotesService = require("./special_notes");
function runAttachedRelations(note, relationName, originEntity) {
if (!note) {
@@ -160,6 +162,8 @@ eventService.subscribe(eventService.ENTITY_CHANGED, ({ entityName, entity }) =>
});
});
+const debouncedCreateMissingSpecialNotes = debounce(() => specialNotesService.createMissingSpecialNotes(), 300);
+
eventService.subscribe(eventService.ENTITY_DELETED, ({ entityName, entity }) => {
processInverseRelations(entityName, entity, (definition, note, targetNote) => {
// if one inverse attribute is deleted then the other should be deleted as well
@@ -175,6 +179,13 @@ eventService.subscribe(eventService.ENTITY_DELETED, ({ entityName, entity }) =>
if (entityName === 'branches') {
runAttachedRelations(entity.getNote(), 'runOnBranchDeletion', entity);
}
+
+ if (entityName === 'notes') {
+ if (entity.noteId.startsWith("lb_")) {
+ // if user deletes shortcuts, restore them immediately
+ debouncedCreateMissingSpecialNotes();
+ }
+ }
});
module.exports = {
diff --git a/src/services/note_types.js b/src/services/note_types.js
index b85d90bc1..38172beef 100644
--- a/src/services/note_types.js
+++ b/src/services/note_types.js
@@ -10,5 +10,6 @@ module.exports = [
'note-map',
'mermaid',
'canvas',
- 'web-view'
+ 'web-view',
+ 'shortcut'
];
diff --git a/src/services/special_notes.js b/src/services/special_notes.js
index f7887a00a..e9cb68c1f 100644
--- a/src/services/special_notes.js
+++ b/src/services/special_notes.js
@@ -244,7 +244,7 @@ function getLaunchBarRoot() {
branchId: 'lb_root',
noteId: 'lb_root',
title: 'Launch bar',
- type: 'text',
+ type: 'shortcut',
content: '',
parentNoteId: getHiddenRoot().noteId
}).note;
@@ -263,7 +263,7 @@ function getLaunchBarAvailableShortcutsRoot() {
branchId: 'lb_availableshortcuts',
noteId: 'lb_availableshortcuts',
title: 'Available shortcuts',
- type: 'text',
+ type: 'shortcut',
content: '',
parentNoteId: getLaunchBarRoot().noteId
}).note;
@@ -288,7 +288,7 @@ function getLaunchBarVisibleShortcutsRoot() {
branchId: 'lb_visibleshortcuts',
noteId: 'lb_visibleshortcuts',
title: 'Visible shortcuts',
- type: 'text',
+ type: 'shortcut',
content: '',
parentNoteId: getLaunchBarRoot().noteId
}).note;
@@ -347,7 +347,7 @@ function createMissingSpecialNotes() {
branchId: shortcut.id,
noteId: shortcut.id,
title: shortcut.title,
- type: 'text',
+ type: 'shortcut',
content: '',
parentNoteId: parentNoteId
}).note;