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

#126, autocomplete + can save relations

Browse Source
This commit is contained in:
azivner
2018-07-27 11:28:24 +02:00
parent 8a95afd756
commit 697eee2706
2 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/public/javascripts/dialogs/relations.js
View File

@@ -1,6 +1,9 @@
import noteDetailService from '../services/note_detail.js';
import server from '../services/server.js';
import infoService from "../services/info.js";
import treeService from "../services/tree.js";
import linkService from "../services/link.js";
import treeUtils from "../services/tree_utils.js";
const $dialog = $("#relations-dialog");
const $saveRelationsButton = $("#save-relations-button");
@@ -97,6 +100,11 @@ function RelationsModel() {
infoService.showMessage("Relations have been saved.");
// FIXME FIXME FIXME FIXME FIXME
// FIXME FIXME FIXME FIXME FIXME
// FIXME FIXME FIXME FIXME FIXME
// FIXME FIXME FIXME FIXME FIXME
// FIXME FIXME FIXME FIXME FIXME
noteDetailService.loadRelationList();
};
@@ -104,11 +112,11 @@ function RelationsModel() {
const relations = self.relations().filter(attr => attr().isDeleted === 0);
const last = relations.length === 0 ? null : relations[relations.length - 1]();
if (!last || last.name.trim() !== "" || last.value !== "") {
if (!last || last.name.trim() !== "" || last.targetNoteId !== "") {
self.relations.push(ko.observable({
relationId: '',
name: '',
value: '',
targetNoteId: '',
isDeleted: 0,
position: 0
}));
@@ -144,7 +152,7 @@ function RelationsModel() {
this.isEmptyName = function(index) {
const cur = self.relations()[index]();
return cur.name.trim() === "" && (cur.relationId !== "" || cur.value !== "");
return cur.name.trim() === "" && (cur.relationId !== "" || cur.targetNoteId !== "");
};
this.getTargetRelation = function(target) {
@@ -175,36 +183,6 @@ $(document).on('focus', '.relation-name', function (e) {
// shouldn't be required and autocomplete should just accept array of strings, but that fails
// because we have overriden filter() function in autocomplete.js
source: relationNames.map(relation => {
return {
relation: relation,
value: relation
}
}),
minLength: 0
});
}
$(this).autocomplete("search", $(this).val());
});
$(document).on('focus', '.relation-value', async function (e) {
if (!$(this).hasClass("ui-autocomplete-input")) {
const relationName = $(this).parent().parent().find('.relation-name').val();
if (relationName.trim() === "") {
return;
}
const relationValues = await server.get('relations/values/' + encodeURIComponent(relationName));
if (relationValues.length === 0) {
return;
}
$(this).autocomplete({
// shouldn't be required and autocomplete should just accept array of strings, but that fails
// because we have overriden filter() function in autocomplete.js
source: relationValues.map(relation => {
return {
label: relation,
value: relation
@@ -217,6 +195,46 @@ $(document).on('focus', '.relation-value', async function (e) {
$(this).autocomplete("search", $(this).val());
});
$(document).on('focus', '.relation-target-note-id', async function (e) {
if (!$(this).hasClass("ui-autocomplete-input")) {
await $(this).autocomplete({
source: async function(request, response) {
const result = await server.get('autocomplete?query=' + encodeURIComponent(request.term));
if (result.length > 0) {
response(result.map(row => {
return {
label: row.label,
value: row.label + ' (' + row.value + ')'
}
}));
}
else {
response([{
label: "No results",
value: "No results"
}]);
}
},
minLength: 0,
select: function (event, ui) {
if (ui.item.value === 'No results') {
return false;
}
},
});
}
$(this).autocomplete("search", $(this).val());
});
$(document).on('click', '.relations-show-recent-notes', function () {
alert("HI!");
alert($(this).parent().find('.relation-target-note-id').length);
$(this).parent().find('.relation-target-note-id').autocomplete("search", "");
});
export default {
showDialog
};