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

added relation name autocomplete to relation map connection creation

Browse Source
This commit is contained in:
azivner
2018-11-13 10:42:55 +01:00
parent 8dc32e581e
commit 144e814b02
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,7 +236,7 @@ async function showDialog() {
$dialog.on('focus', '.attribute-name', function (e) {
attributeAutocompleteService.initAttributeNameAutocomplete({
$el: $(this),
attrTypeFunc: () => {
attributeType: () => {
const attribute = attributesModel.getTargetAttribute(this);
return (attribute().type === 'relation' || attribute().type === 'relation-definition') ? 'relation' : 'label';
},

15
src/public/javascripts/dialogs/prompt.js
View File

@@ -4,19 +4,28 @@ const $answer = $("#prompt-dialog-answer");
const $form = $("#prompt-dialog-form");
let resolve;
let shownCb;
function ask(message, defaultValue = '') {
function ask({ message, defaultValue, shown }) {
glob.activeDialog = $dialog;
shownCb = shown;
$question.text(message);
$answer.val(defaultValue);
$answer.val(defaultValue || "");
$dialog.modal();
return new Promise((res, rej) => { resolve = res; });
}
$dialog.on('shown.bs.modal', () => $answer.focus().select());
$dialog.on('shown.bs.modal', () => {
if (shownCb) {
shownCb({ $dialog, $question, $answer, $form });
}
$answer.focus().select();
});
$dialog.on("hidden.bs.modal", () => {
if (resolve) {