Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-09 06:45:49 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam
2022-07-08 22:21:41 +02:00
parent 95bbf5f405 12b3302687
commit c2c724aa00
14 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/widgets/dialogs/options/appearance.js
View File

@@ -297,7 +297,7 @@ export default class ApperanceOptions {
this.$themeSelect.append($("<option>")
.attr("value", theme.val)
.attr("data-note-id", theme.noteId)
.html(theme.title));
.text(theme.title));
}
this.$themeSelect.val(options.theme);

4
src/public/app/widgets/ribbon_widgets/edited_notes.js
View File

@@ -77,7 +77,9 @@ export default class EditedNotesWidget extends CollapsibleWidget {
);
}
else {
$item.append(editedNote.notePath ? await linkService.createNoteLink(editedNote.notePath.join("/"), {showNotePath: true}) : editedNote.title);
$item.append(editedNote.notePath
? await linkService.createNoteLink(editedNote.notePath.join("/"), {showNotePath: true})
: $("<span>").text(editedNote.title));
}
if (i < editedNotes.length - 1) {

3
src/public/app/widgets/type_widgets/editable_text.js
View File

@@ -311,7 +311,8 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
const note = await froca.getNote(noteId);
this.textEditor.model.change( writer => {
const src = `api/images/${note.noteId}/${note.title}`;
const sanitizedTitle = note.title.replace(/[^a-z0-9-.]/gi, "");
const src = `api/images/${note.noteId}/${sanitizedTitle}`;
const imageElement = writer.createElement( 'image', { 'src': src } );

2
src/public/app/widgets/type_widgets/empty.js
View File

@@ -79,7 +79,7 @@ export default class EmptyTypeWidget extends TypeWidget {
this.$workspaceNotes.append(
$('<div class="workspace-note">')
.append($("<div>").addClass(workspaceNote.getIcon() + " workspace-icon"))
.append($("<div>").append(workspaceNote.title))
.append($("<div>").text(workspaceNote.title))
.attr("title", "Enter workspace " + workspaceNote.title)
.on('click', () => this.triggerCommand('hoistNote', {noteId: workspaceNote.noteId}))
);