gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 21:19:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

fix: 🐛 fix add external link

Browse Source 
fix can't add external link from add link dialog
This commit is contained in:
Jin 2025-03-04 00:33:09 +01:00
parent 5543650166
commit f1f55fd4f8
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/app/services/note_autocomplete.ts
View File

@ -322,9 +322,7 @@ function init() {
$.fn.setSelectedNotePath = function (notePath) { $.fn.setSelectedNotePath = function (notePath) {
notePath = notePath || ""; notePath = notePath || "";
$(this).attr(SELECTED_NOTE_PATH_KEY, notePath); $(this).attr(SELECTED_NOTE_PATH_KEY, notePath);
$(this).closest(".input-group").find(".go-to-selected-note-button").toggleClass("disabled", !notePath.trim()).attr("href", `#${notePath}`); // we also set href here so tooltip can be displayed $(this).closest(".input-group").find(".go-to-selected-note-button").toggleClass("disabled", !notePath.trim()).attr("href", `#${notePath}`); // we also set href here so tooltip can be displayed
}; };
@ -336,11 +334,9 @@ function init() {
} }
}; };
$.fn.setSelectedExternalLink = function (externalLink) { $.fn.setSelectedExternalLink = function (externalLink: string | null) {
if (externalLink) { $(this).attr(SELECTED_EXTERNAL_LINK_KEY, externalLink);
// TODO: This doesn't seem to do anything with the external link, is it normal? $(this).closest(".input-group").find(".go-to-selected-note-button").toggleClass("disabled", true);
$(this).closest(".input-group").find(".go-to-selected-note-button").toggleClass("disabled", true);
}
}; };
$.fn.setNote = async function (noteId) { $.fn.setNote = async function (noteId) {

5
src/public/app/widgets/dialogs/add_link.ts
View File

@ -88,13 +88,13 @@ export default class AddLinkDialog extends BasicWidget {
if (this.$autoComplete.getSelectedNotePath()) { if (this.$autoComplete.getSelectedNotePath()) {
this.$widget.modal("hide"); this.$widget.modal("hide");
const linkTitle = this.getLinkType() === "reference-link" ? null : this.$linkTitle.val() as string; const linkTitle = this.getLinkType() === "reference-link" ? null : this.$linkTitle.val();
this.textTypeWidget?.addLink(this.$autoComplete.getSelectedNotePath()!, linkTitle); this.textTypeWidget?.addLink(this.$autoComplete.getSelectedNotePath()!, linkTitle);
} else if (this.$autoComplete.getSelectedExternalLink()) { } else if (this.$autoComplete.getSelectedExternalLink()) {
this.$widget.modal("hide"); this.$widget.modal("hide");
this.textTypeWidget?.addLink(this.$autoComplete.getSelectedExternalLink()!, this.$linkTitle.val() as string); this.textTypeWidget?.addLink(this.$autoComplete.getSelectedExternalLink()!, this.$linkTitle.val(), true);
} else { } else {
logError("No link to add."); logError("No link to add.");
} }
@ -149,7 +149,6 @@ export default class AddLinkDialog extends BasicWidget {
}); });
this.$autoComplete.on("autocomplete:externallinkselected", (event: JQuery.Event, suggestion: Suggestion) => { this.$autoComplete.on("autocomplete:externallinkselected", (event: JQuery.Event, suggestion: Suggestion) => {
console.log("autocomplete:externallinkselected", event, suggestion);
if (!suggestion.externalLink) { if (!suggestion.externalLink) {
return false; return false;
} }

8
src/public/app/widgets/type_widgets/editable_text.js
View File

@ -290,7 +290,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
this.watchdog?.editor.editing.view.focus(); this.watchdog?.editor.editing.view.focus();
} }
show() {} show() { }
getEditor() { getEditor() {
return this.watchdog?.editor; return this.watchdog?.editor;
@ -337,14 +337,14 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
this.addTextToEditor(text); this.addTextToEditor(text);
} }
async addLink(notePath, linkTitle) { async addLink(notePath, linkTitle, externalLink = false) {
await this.initialized; await this.initialized;
if (linkTitle) { if (linkTitle) {
if (this.hasSelection()) { if (this.hasSelection()) {
this.watchdog.editor.execute("link", `#${notePath}`); this.watchdog.editor.execute("link", externalLink ? `${notePath}` : `#${notePath}`);
} else { } else {
await this.addLinkToEditor(`#${notePath}`, linkTitle); await this.addLinkToEditor(externalLink ? `${notePath}` : `#${notePath}`, linkTitle);
} }
} else { } else {
this.watchdog.editor.execute("referenceLink", { href: "#" + notePath }); this.watchdog.editor.execute("referenceLink", { href: "#" + notePath });