krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(links): better http/s handling

Browse Source
This commit is contained in:
SabreCat
2023-04-04 18:25:14 -05:00
parent 7363f08a86
commit 2df6b6461b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/src/components/appFooter.vue
View File

@@ -213,7 +213,7 @@
</a> </a>
<a <a
class="social-circle" class="social-circle"
href="https://twitter.com/habitica" href="https://twitter.com/habitica/"
target="_blank" target="_blank"
> >
<div <div
@@ -223,7 +223,7 @@
</a> </a>
<a <a
class="social-circle" class="social-circle"
href="https://www.facebook.com/Habitica" href="https://www.facebook.com/Habitica/"
target="_blank" target="_blank"
> >
<div <div

5
website/client/src/mixins/externalLinks.js
View File

@@ -8,10 +8,11 @@ export default {
for (let i = 0; i < allLinks.length; i += 1) { for (let i = 0; i < allLinks.length; i += 1) {
const link = allLinks[i]; const link = allLinks[i];
const domainIndex = link.href.indexOf('//') + 2;
if ((link.classList.value.indexOf('external-link') === -1) if ((link.classList.value.indexOf('external-link') === -1)
&& link.href.slice(0, 4) === 'http' && domainIndex !== 1
&& !some(TRUSTED_DOMAINS.split(','), domain => link.href.indexOf(domain) === 0)) { && !some(TRUSTED_DOMAINS.split(','), domain => link.href.indexOf(domain) === domainIndex)) {
link.classList.add('external-link'); link.classList.add('external-link');
link.addEventListener('click', e => { link.addEventListener('click', e => {
if (e.ctrlKey) { if (e.ctrlKey) {