From 42ecc0e15b054df58e58d6e592912011056899d2 Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 3 Sep 2020 17:38:11 +0200 Subject: [PATCH] use just note title in note autocomplete input field --- package-lock.json | 2 +- package.json | 2 +- src/public/app/services/note_autocomplete.js | 7 ++++++- src/routes/api/autocomplete.js | 10 +++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 72f321772..5fc034b7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.43.3", + "version": "0.43.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5acb71472..5810633f6 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ }, "devDependencies": { "cross-env": "7.0.2", - "electron": "9.2.1", + "electron": "9.3.0", "electron-builder": "22.8.0", "electron-packager": "15.1.0", "electron-rebuild": "2.0.1", diff --git a/src/public/app/services/note_autocomplete.js b/src/public/app/services/note_autocomplete.js index af1a6da8b..3f736c5b6 100644 --- a/src/public/app/services/note_autocomplete.js +++ b/src/public/app/services/note_autocomplete.js @@ -95,7 +95,12 @@ function initNoteAutocomplete($el, options) { } ]); - $el.on('autocomplete:selected', (event, suggestion) => $el.setSelectedNotePath(suggestion.notePath)); + $el.on('autocomplete:selected', (event, suggestion) => { + $el.setSelectedNotePath(suggestion.notePath); + + $el.autocomplete("val", suggestion.noteTitle); + }); + $el.on('autocomplete:closed', () => { if (!$el.val().trim()) { clearText($el); diff --git a/src/routes/api/autocomplete.js b/src/routes/api/autocomplete.js index a6aad50fa..84f7ea741 100644 --- a/src/routes/api/autocomplete.js +++ b/src/routes/api/autocomplete.js @@ -57,12 +57,16 @@ function getRecentNotes(activeNoteId) { LIMIT 200`, params); return recentNotes.map(rn => { - const title = noteCacheService.getNoteTitleForPath(rn.notePath.split('/')); + const notePathArray = rn.notePath.split('/'); + + const noteTitle = noteCacheService.getNoteTitle(notePathArray[notePathArray.length - 1]); + const notePathTitle = noteCacheService.getNoteTitleForPath(notePathArray); return { notePath: rn.notePath, - notePathTitle: title, - highlightedNotePathTitle: utils.escapeHtml(title) + noteTitle, + notePathTitle, + highlightedNotePathTitle: utils.escapeHtml(notePathTitle) }; }); }