From 1805dec968fc91aabcec194ef8a8536f64a04ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sat, 9 Jul 2022 23:59:41 +0200 Subject: [PATCH] remove onLinkClick MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../announcements/announcement-content.tsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app/soapbox/components/announcements/announcement-content.tsx b/app/soapbox/components/announcements/announcement-content.tsx index 01c21b39f..3e00241df 100644 --- a/app/soapbox/components/announcements/announcement-content.tsx +++ b/app/soapbox/components/announcements/announcement-content.tsx @@ -34,10 +34,12 @@ const AnnouncementContent: React.FC = ({ announcement }) = } }; - /** For regular links, just stop propogation */ - const onLinkClick = (e: MouseEvent) => { - e.stopPropagation(); - }; + // const onStatusClick = (status, e: MouseEvent) => { + // if (e.button === 0 && !(e.ctrlKey || e.metaKey)) { + // e.preventDefault(); + // history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`); + // } + // }; const updateLinks = () => { if (!node.current) return; @@ -55,15 +57,19 @@ const AnnouncementContent: React.FC = ({ announcement }) = const mention = announcement.mentions.find(mention => link.href === `${mention.url}`); - // Add event listeners on mentions and hashtags + // Add event listeners on mentions, hashtags and statuses if (mention) { link.addEventListener('click', onMentionClick.bind(link, mention), false); link.setAttribute('title', mention.acct); } else if (link.textContent?.charAt(0) === '#' || (link.previousSibling?.textContent?.charAt(link.previousSibling.textContent.length - 1) === '#')) { link.addEventListener('click', onHashtagClick.bind(link, link.text), false); - } else { - link.setAttribute('title', link.href); - link.addEventListener('click', onLinkClick.bind(link), false); + // } else { + // const status = announcement.statuses.find(item => link.href === item.get('url')); + // if (status) { + // link.addEventListener('click', onStatusClick.bind(this, status), false); + // } + // link.setAttribute('title', link.href); + // link.classList.add('unhandled-link'); } }); };