MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 14:53:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix copy to clipboard

Browse Source
This commit is contained in:
Natsumi
2025-09-13 09:53:59 +12:00
parent c91fec4d9d
commit e4962cc180
2 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/shared/utils/common.js
View File

@@ -391,30 +391,23 @@ function openExternalLink(link) {
distinguishCancelAndClose: true, distinguishCancelAndClose: true,
confirmButtonText: 'Open', confirmButtonText: 'Open',
cancelButtonText: 'Copy', cancelButtonText: 'Copy',
type: 'info' type: 'info',
beforeClose: (action, instance, done) => {
if (action === 'cancel') {
copyToClipboard(link);
}
done();
}
}) })
.then((action) => { .then((action) => {
console.log(action);
if (action === 'confirm') { if (action === 'confirm') {
AppApi.OpenLink(link); AppApi.OpenLink(link);
} else if (action === 'cancel') {
copyLink(link);
} }
}) })
.catch(() => {}); .catch(() => {});
} }
/**
*
* @param {string} text
*/
function copyLink(text) {
ElMessage({
message: 'Link copied to clipboard',
type: 'success'
});
copyToClipboard(text);
}
/** /**
* *
* @param {object} ref * @param {object} ref
@@ -541,7 +534,6 @@ export {
buildTreeData, buildTreeData,
replaceBioSymbols, replaceBioSymbols,
openExternalLink, openExternalLink,
copyLink,
getBundleDateSize, getBundleDateSize,
openFolderGeneric, openFolderGeneric,
debounce debounce

31
src/stores/auth.js
View File

@@ -662,6 +662,9 @@ export const useAuthStore = defineStore('Auth', () => {
inputErrorMessage: t('prompt.totp.input_error'), inputErrorMessage: t('prompt.totp.input_error'),
beforeClose: (action, instance, done) => { beforeClose: (action, instance, done) => {
state.twoFactorAuthDialogVisible = false; state.twoFactorAuthDialogVisible = false;
if (action === 'cancel') {
promptOTP();
}
done(); done();
} }
} }
@@ -672,15 +675,12 @@ export const useAuthStore = defineStore('Auth', () => {
code: value.trim() code: value.trim()
}) })
.catch((err) => { .catch((err) => {
console.error(err);
clearCookiesTryLogin(); clearCookiesTryLogin();
throw err;
}) })
.then((args) => { .then(() => {
userStore.getCurrentUser(); userStore.getCurrentUser();
return args;
}); });
} else if (action === 'cancel') {
promptOTP();
} }
}); });
} }
@@ -702,6 +702,9 @@ export const useAuthStore = defineStore('Auth', () => {
inputErrorMessage: t('prompt.otp.input_error'), inputErrorMessage: t('prompt.otp.input_error'),
beforeClose: (action, instance, done) => { beforeClose: (action, instance, done) => {
state.twoFactorAuthDialogVisible = false; state.twoFactorAuthDialogVisible = false;
if (action === 'cancel') {
promptTOTP();
}
done(); done();
} }
} }
@@ -712,15 +715,12 @@ export const useAuthStore = defineStore('Auth', () => {
code: value.trim() code: value.trim()
}) })
.catch((err) => { .catch((err) => {
console.error(err);
clearCookiesTryLogin(); clearCookiesTryLogin();
throw err;
}) })
.then((args) => { .then(() => {
userStore.getCurrentUser(); userStore.getCurrentUser();
return args;
}); });
} else if (action === 'cancel') {
promptTOTP();
} }
}); });
} }
@@ -743,6 +743,10 @@ export const useAuthStore = defineStore('Auth', () => {
inputErrorMessage: t('prompt.email_otp.input_error'), inputErrorMessage: t('prompt.email_otp.input_error'),
beforeClose: (action, instance, done) => { beforeClose: (action, instance, done) => {
state.twoFactorAuthDialogVisible = false; state.twoFactorAuthDialogVisible = false;
if (action === 'cancel') {
resendEmail2fa();
return;
}
done(); done();
} }
} }
@@ -753,15 +757,12 @@ export const useAuthStore = defineStore('Auth', () => {
code: value.trim() code: value.trim()
}) })
.catch((err) => { .catch((err) => {
console.error(err);
promptEmailOTP(); promptEmailOTP();
throw err;
}) })
.then((args) => { .then(() => {
userStore.getCurrentUser(); userStore.getCurrentUser();
return args;
}); });
} else if (action === 'cancel') {
resendEmail2fa();
} }
}); });
} }