HTWK/htwkalender-pwa
1
0
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender-pwa.git synced 2025-07-16 09:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix WebShare API permissions by checking the URL to share

Browse Source
This commit is contained in:
survellow
2024-09-23 19:03:24 +02:00
parent f40ec4fc36
commit 3ed25a412f
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/components/CalendarLink.vue
View File

@ -84,14 +84,16 @@ const forwardToHTWKalendar = () => {
});
};
const shareData = computed(() => ({
title: t("calendarLink.shareTitle"),
text: t("calendarLink.shareText") + getLink(),
url: "https://" + domain + "/",
}));
const shareLink = () => {
if (typeof navigator.share === 'function' && navigator.canShare()) {
if (typeof navigator.share === 'function' && navigator.canShare(shareData.value)) {
navigator
.share({
title: t("calendarLink.shareTitle"),
text: t("calendarLink.shareText") + getLink(),
url: "https://" + domain + "/",
})
.share(shareData.value)
.then(() => {
toast.add({
severity: "info",
@ -142,7 +144,7 @@ const actions = computed(() => {
}
];
if (typeof navigator.share === 'function' && navigator.canShare()) {
if (typeof navigator.share === 'function' && navigator.canShare(shareData.value)) {
actionList.push({
label: t("calendarLink.share"),
icon: "pi pi-share-alt",

14
frontend/src/view/UserCalendar.vue
View File

@ -59,12 +59,14 @@ function shareLink() {
}
const link = "https://" + window.location.hostname + "/calendar/view?token=" + token.value + datePart;
if (typeof navigator.share === "function" && navigator.canShare()) {
navigator.share({
title: t("calendarLink.shareLinkTitle"),
text: t("calendarLink.shareLinkText"),
url: link,
});
const shareData = {
title: t("calendarLink.shareLinkTitle"),
text: t("calendarLink.shareLinkText"),
url: link,
};
if (typeof navigator.share === "function" && navigator.canShare(shareData)) {
navigator.share(shareData);
} else {
navigator.clipboard.writeText(link).then(() => {
toast.add({