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

grid items in note list are clickable as a whole

Browse Source
This commit is contained in:
zadam 2021-03-30 23:26:14 +02:00
parent f1f4f45c9d
commit 9cd45299b1
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/services/link.js
View File

@ -72,7 +72,7 @@ function goToLink(e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
const $link = $(e.target).closest("a"); const $link = $(e.target).closest("a,.block-link");
const notePath = getNotePathFromLink($link); const notePath = getNotePathFromLink($link);

20
src/public/app/services/note_list_renderer.js
View File

@ -20,6 +20,7 @@ const TPL = `
.note-list.grid-view .note-book-card { .note-list.grid-view .note-book-card {
flex-basis: 300px; flex-basis: 300px;
border: 1px solid transparent;
} }
.note-list.grid-view .note-expander { .note-list.grid-view .note-expander {
@ -30,6 +31,12 @@ const TPL = `
max-height: 300px; max-height: 300px;
} }
.note-list.grid-view .note-book-card:hover {
cursor: pointer;
border: 1px solid var(--main-border-color);
background: var(--more-accented-background-color);
}
.note-book-card { .note-book-card {
border-radius: 10px; border-radius: 10px;
background-color: var(--accented-background-color); background-color: var(--accented-background-color);
@ -310,6 +317,7 @@ class NoteListRenderer {
const $expander = $('<span class="note-expander bx bx-chevron-right"></span>'); const $expander = $('<span class="note-expander bx bx-chevron-right"></span>');
const {$renderedAttributes} = await attributeRenderer.renderNormalAttributes(note); const {$renderedAttributes} = await attributeRenderer.renderNormalAttributes(note);
const notePath = this.parentNote.noteId + '/' + note.noteId;
const $card = $('<div class="note-book-card">') const $card = $('<div class="note-book-card">')
.attr('data-note-id', note.noteId) .attr('data-note-id', note.noteId)
@ -317,10 +325,20 @@ class NoteListRenderer {
$('<h5 class="note-book-title">') $('<h5 class="note-book-title">')
.append($expander) .append($expander)
.append($('<span class="note-icon">').addClass(note.getIcon())) .append($('<span class="note-icon">').addClass(note.getIcon()))
.append(await linkService.createNoteLink(note.noteId, {showTooltip: false, showNotePath: this.showNotePath})) .append(this.viewType === 'grid'
? note.title
: await linkService.createNoteLink(notePath, {showTooltip: false, showNotePath: this.showNotePath})
)
.append($renderedAttributes) .append($renderedAttributes)
); );
if (this.viewType === 'grid') {
$card
.addClass("block-link")
.attr("data-note-path", notePath)
.on('click', e => linkService.goToLink(e));
}
$expander.on('click', () => this.toggleContent($card, note, !$card.hasClass("expanded"))); $expander.on('click', () => this.toggleContent($card, note, !$card.hasClass("expanded")));
await this.toggleContent($card, note, expand); await this.toggleContent($card, note, expand);