yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix link issues

Browse Source
This commit is contained in:
Lone Iversen
2023-10-16 13:52:17 +02:00
parent 1c6a2ac6e5
commit fac4af80cc
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tiny-mce/plugins/tiny-mce-linkpicker.plugin.ts
View File

@@ -76,26 +76,22 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
//if we already have a link selected, we want to pass that data over to the dialog
const currentTarget: UmbLinkPickerLink = {
name: this.#anchorElement.textContent,
url: this.#anchorElement.getAttribute('href') ?? '',
name: this.#anchorElement.title || this.#anchorElement.textContent,
target: this.#anchorElement.target,
queryString: `${this.#anchorElement.search}${this.#anchorElement.hash}`,
};
// drop the lead char from the anchor text, if it has a value
const anchorVal = this.#anchorElement.dataset.anchor;
if (anchorVal) {
currentTarget.queryString = anchorVal.substring(1);
}
if (currentTarget.url?.includes('localLink:')) {
currentTarget.udi =
currentTarget.url?.substring(currentTarget.url.indexOf(':') + 1, currentTarget.url.lastIndexOf('}')) ?? '';
if (this.#anchorElement.href.includes('localLink:')) {
const href = this.#anchorElement.getAttribute('href')!;
currentTarget.udi = href.split('localLink:')[1].slice(0, -1);
} else if (this.#anchorElement.host.length) {
currentTarget.url = this.#anchorElement.protocol ? this.#anchorElement.protocol + '//' : undefined;
currentTarget.url += this.#anchorElement.host + this.#anchorElement.pathname;
}
this.#openLinkPicker(currentTarget);
}
// TODO => get anchors to provide to link picker?
async #openLinkPicker(currentTarget?: UmbLinkPickerLink) {
const modalHandler = this.#modalContext?.open(UMB_LINK_PICKER_MODAL, {
config: {
@@ -117,7 +113,9 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
//Create a json obj used to create the attributes for the tag
// TODO => where has rel gone?
#createElemAttributes() {
const a: AnchorElementAttributes = Object.assign({}, this.#linkPickerData?.link, { 'data-anchor': null });
// Attribute 'name' because of linkPickerData. It should be 'title' .
const { name, ...linkPickerData } = this.#linkPickerData!.link;
const a: AnchorElementAttributes = Object.assign({}, linkPickerData);
// always need to map back to href for tinymce to render correctly
// do this first as checking querystring below may modify the href property
@@ -125,6 +123,10 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
a.href = this.#linkPickerData.link.url;
}
if (this.#linkPickerData?.link.name) {
a.title = name;
}
if (this.#linkPickerData?.link.queryString?.startsWith('#')) {
a['data-anchor'] = this.#linkPickerData?.link.queryString;
a.href += this.#linkPickerData?.link.queryString;
@@ -185,7 +187,7 @@ export default class UmbTinyMceLinkPickerPlugin extends UmbTinyMcePluginBase {
}
}
if (!this.#linkPickerData?.link.url && !this.#linkPickerData?.link.queryString) {
if (!this.#linkPickerData?.link.url && !this.#linkPickerData?.link.queryString && !this.#linkPickerData?.link.udi) {
this.editor.execCommand('unlink');
return;
}