mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 13:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add a fallback when the browser does not support copying the share link to clipboard (not a secure origin)

Browse source 
See: https://stackoverflow.com/a/51823007
This commit is contained in:
Deluan 2023-01-30 12:09:01 -05:00
parent 762a1ba998
commit b6fcfa9fc8
4 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/i18n/pt.json
View file

@ -365,6 +365,7 @@
"shareOriginalFormat": "Compartilhar no formato original", "shareOriginalFormat": "Compartilhar no formato original",
"shareDialogTitle": "Compartilhar %{resource} '%{name}'", "shareDialogTitle": "Compartilhar %{resource} '%{name}'",
"shareBatchDialogTitle": "Compartilhar 1 %{resource} |||| Compartilhar %{smart_count} %{resource}", "shareBatchDialogTitle": "Compartilhar 1 %{resource} |||| Compartilhar %{smart_count} %{resource}",
"shareCopyToClipboard": "Copie para o clipboard: Ctrl+C, Enter",
"shareSuccess": "Link copiado para o clipboard : %{url}", "shareSuccess": "Link copiado para o clipboard : %{url}",
"shareFailure": "Erro ao copiar o link %{url} para o clipboard", "shareFailure": "Erro ao copiar o link %{url} para o clipboard",
"downloadDialogTitle": "Baixar %{resource} '%{name}' (%{size})" "downloadDialogTitle": "Baixar %{resource} '%{name}' (%{size})"
@ -451,4 +452,4 @@
"current_song": "Vai para música atual" "current_song": "Vai para música atual"
} }
} }
} }

32
ui/src/dialogs/ShareDialog.js
View file

@ -47,21 +47,23 @@ export const ShareDialog = () => {
{ {
onSuccess: (res) => { onSuccess: (res) => {
const url = shareUrl(res?.data?.id) const url = shareUrl(res?.data?.id)
navigator.clipboard if (navigator.clipboard && window.isSecureContext) {
.writeText(url) navigator.clipboard
.then(() => { .writeText(url)
notify('message.shareSuccess', 'info', { url }, false, 0) .then(() => {
}) notify('message.shareSuccess', 'info', { url }, false, 0)
.catch((err) => { })
notify( .catch((err) => {
translate('message.shareFailure', { url }) + ': ' + err.message, notify(
{ translate('message.shareFailure', { url }) + ': ' + err.message,
type: 'warning', {
multiLine: true, type: 'warning',
duration: 0, multiLine: true,
} duration: 0,
) }
}) )
})
} else prompt(translate('message.shareCopyToClipboard'), url)
}, },
onFailure: (error) => onFailure: (error) =>
notify(translate('ra.page.error') + ': ' + error.message, { notify(translate('ra.page.error') + ': ' + error.message, {

1
ui/src/i18n/en.json
View file

@ -369,6 +369,7 @@
"shareOriginalFormat": "Share in original format", "shareOriginalFormat": "Share in original format",
"shareDialogTitle": "Share %{resource} '%{name}'", "shareDialogTitle": "Share %{resource} '%{name}'",
"shareBatchDialogTitle": "Share 1 %{resource} |||| Share %{smart_count} %{resource}", "shareBatchDialogTitle": "Share 1 %{resource} |||| Share %{smart_count} %{resource}",
"shareCopyToClipboard": "Copy to clipboard: Ctrl+C, Enter",
"shareSuccess": "URL copied to clipboard: %{url}", "shareSuccess": "URL copied to clipboard: %{url}",
"shareFailure": "Error copying URL %{url} to clipboard", "shareFailure": "Error copying URL %{url} to clipboard",
"downloadDialogTitle": "Download %{resource} '%{name}' (%{size})", "downloadDialogTitle": "Download %{resource} '%{name}' (%{size})",

37
ui/src/share/ShareList.js
View file

@ -29,25 +29,28 @@ const ShareList = (props) => {
const handleShare = (r) => (e) => { const handleShare = (r) => (e) => {
const url = shareUrl(r?.id) const url = shareUrl(r?.id)
navigator.clipboard if (navigator.clipboard && window.isSecureContext) {
.writeText(url) navigator.clipboard
.then(() => { .writeText(url)
notify(translate('message.shareSuccess', { url }), { .then(() => {
type: 'info', notify(translate('message.shareSuccess', { url }), {
multiLine: true, type: 'info',
duration: 0,
})
})
.catch((err) => {
notify(
translate('message.shareFailure', { url }) + ': ' + err.message,
{
type: 'warning',
multiLine: true, multiLine: true,
duration: 0, duration: 0,
} })
) })
}) .catch((err) => {
notify(
translate('message.shareFailure', { url }) + ': ' + err.message,
{
type: 'warning',
multiLine: true,
duration: 0,
}
)
})
} else prompt(translate('message.shareCopyToClipboard'), url)
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()
} }