Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Prevent default when opening chat via xmpp: URI

Browse Source
This commit is contained in:
JC Brand 2020-12-03 10:30:54 +01:00
parent 01ee942920
commit 5a3aaeb056
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/muc.js
View File

@ -841,7 +841,7 @@ describe("Groupchats", function () {
await u.waitUntil(() => view.el.querySelector('.chat-msg__text a'));
view.el.querySelector('.chat-msg__text a').click();
await u.waitUntil(() => _converse.chatboxes.length === 3)
expect(_.includes(_converse.chatboxes.pluck('id'), 'coven@chat.shakespeare.lit')).toBe(true);
expect(_converse.chatboxes.pluck('id').includes('coven@chat.shakespeare.lit')).toBe(true);
done()
}));

8
src/utils/html.js
View File

@ -323,6 +323,12 @@ u.convertToImageTag = function (url, onLoad, onClick) {
return tpl_image({url, onClick, onLoad});
};
function onClickXMPPURI (ev) {
ev.preventDefault();
api.rooms.open(ev.target.href);
}
u.convertURIoHyperlink = function (uri, urlAsTyped) {
let normalized_url = uri.normalize()._string;
const pretty_url = uri._parts.urn ? normalized_url : uri.readable();
@ -334,7 +340,7 @@ u.convertURIoHyperlink = function (uri, urlAsTyped) {
return html`
<a target="_blank"
rel="noopener"
@click=${ev => api.rooms.open(ev.target.href)}
@click=${onClickXMPPURI}
href="${normalized_url}">${visible_url}</a>`;
}
return html`<a target="_blank" rel="noopener" href="${normalized_url}">${visible_url}</a>`;