Skip to content

[4.3] Remove an extra space on the XTD-article #39989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 6, 2023
Merged

[4.3] Remove an extra space on the XTD-article #39989

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bce76b1
Fix extra space
dgrammatiko Mar 2, 2023
87cb744
Merge branch '4.2-dev' into patch-1
roland-d Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 22 additions & 35 deletions build/media_source/com_content/js/admin-articles-modal.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,52 +12,39 @@
* and closes the select frame.
* */
window.jSelectArticle = (id, title, catid, object, link, lang) => {
let hreflang = '';
if (!Joomla.getOptions('xtd-articles')) {
// Something went wrong!
// @TODO Close the modal
return false;
if (window.parent.Joomla.Modal) {
window.parent.Joomla.Modal.getCurrent().close();
}
}

const { editor } = Joomla.getOptions('xtd-articles');

if (lang !== '') {
hreflang = `hreflang="${lang}"`;
}

const tag = `<a ${hreflang} href="${link}">${title}</a>`;
const tag = `<a href="${link}"${lang !== '' ? ` hreflang="${lang}"` : ''}>${title}</a>`;
window.parent.Joomla.editors.instances[editor].replaceSelection(tag);

if (window.parent.Joomla.Modal) {
window.parent.Joomla.Modal.getCurrent().close();
}

return true;
};

document.addEventListener('DOMContentLoaded', () => {
// Get the elements
const elements = document.querySelectorAll('.select-link');

for (let i = 0, l = elements.length; l > i; i += 1) {
document.querySelectorAll('.select-link').forEach((element) => {
// Listen for click event
elements[i].addEventListener('click', (event) => {
event.preventDefault();
const { target } = event;
const functionName = target.getAttribute('data-function');

if (functionName === 'jSelectArticle') {
// Used in xtd_contacts
window[functionName](target.getAttribute('data-id'), target.getAttribute('data-title'), target.getAttribute('data-cat-id'), null, target.getAttribute('data-uri'), target.getAttribute('data-language'));
} else {
// Used in com_menus
window.parent[functionName](target.getAttribute('data-id'), target.getAttribute('data-title'), target.getAttribute('data-cat-id'), null, target.getAttribute('data-uri'), target.getAttribute('data-language'));
}

if (window.parent.Joomla.Modal) {
window.parent.Joomla.Modal.getCurrent().close();
}
});
}
element.addEventListener('click', (event) => {
event.preventDefault();
const { target } = event;
const functionName = target.getAttribute('data-function');

if (functionName === 'jSelectArticle') {
// Used in xtd_contacts
window[functionName](target.getAttribute('data-id'), target.getAttribute('data-title'), target.getAttribute('data-cat-id'), null, target.getAttribute('data-uri'), target.getAttribute('data-language'));
} else {
// Used in com_menus
window.parent[functionName](target.getAttribute('data-id'), target.getAttribute('data-title'), target.getAttribute('data-cat-id'), null, target.getAttribute('data-uri'), target.getAttribute('data-language'));
}

if (window.parent.Joomla.Modal) {
window.parent.Joomla.Modal.getCurrent().close();
}
});
});
})();