gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix attribute name autocomplete, no tooltip preview on path selection

Browse Source
This commit is contained in:
azivner 2018-08-15 18:22:02 +02:00
parent 4513651e12
commit dbe0eb3f3a
4 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/dialogs/attributes.js
View File

@ -246,7 +246,7 @@ async function showDialog() {
$dialog.dialog({ $dialog.dialog({
modal: true, modal: true,
width: 950, width: 950,
height: 500 height: 700
}); });
} }

10
src/public/javascripts/services/tooltip.js
View File

@ -6,10 +6,16 @@ function setupTooltip() {
$(document).tooltip({ $(document).tooltip({
items: "body a", items: "body a",
content: function (callback) { content: function (callback) {
let notePath = linkService.getNotePathFromLink($(this).attr("href")); const $link = $(this);
if ($link.hasClass("no-tooltip-preview")) {
return;
}
let notePath = linkService.getNotePathFromLink($link.attr("href"));
if (!notePath) { if (!notePath) {
notePath = $(this).attr("data-note-path"); notePath = $link.attr("data-note-path");
} }
if (notePath) { if (notePath) {

6
src/public/javascripts/services/tree.js
View File

@ -206,7 +206,11 @@ async function showPaths(noteId, node) {
const notePath = parentNotePath ? (parentNotePath + '/' + noteId) : noteId; const notePath = parentNotePath ? (parentNotePath + '/' + noteId) : noteId;
const title = await treeUtils.getNotePathTitle(notePath); const title = await treeUtils.getNotePathTitle(notePath);
const item = $("<li/>").append(await linkService.createNoteLink(notePath, title)); const noteLink = await linkService.createNoteLink(notePath, title);
noteLink.addClass("no-tooltip-preview");
const item = $("<li/>").append(noteLink);
if (node.getParent().data.noteId === parentNote.noteId) { if (node.getParent().data.noteId === parentNote.noteId) {
item.addClass("current"); item.addClass("current");

23
src/services/attributes.js
View File

@ -59,17 +59,20 @@ async function createAttribute(attribute) {
} }
async function getAttributeNames(type, nameLike) { async function getAttributeNames(type, nameLike) {
const names = await sql.getColumn( let names;
`SELECT DISTINCT name
FROM attributes
WHERE isDeleted = 0
AND type = ?
AND name LIKE '%${utils.sanitizeSql(nameLike)}%'`, [ type ]);
for (const attribute of BUILTIN_ATTRIBUTES) { if (!nameLike) {
if (attribute.type === type && !names.includes(attribute.name)) { names = BUILTIN_ATTRIBUTES
names.push(attribute.name); .filter(attribute => attribute.type === type)
} .map(attribute => attribute.name);
}
else {
names = await sql.getColumn(
`SELECT DISTINCT name
FROM attributes
WHERE isDeleted = 0
AND type = ?
AND name LIKE '%${utils.sanitizeSql(nameLike)}%'`, [type]);
} }
names.sort(); names.sort();