c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-29 15:11:58 +00:00
Code Releases Activity

chore(web): Only show Copy button in HTTPS context (#2983)

Browse source
This commit is contained in:
Alex 2023-06-27 08:49:20 -05:00 committed by GitHub
parent f5d9826b12
commit b3e97a1a0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
web/src/lib/components/forms/api-key-secret.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte';
import { createEventDispatcher, onMount } from 'svelte';
import KeyVariant from 'svelte-material-icons/KeyVariant.svelte';
import { handleError } from '../../utils/handle-error';
import FullScreenModal from '../shared-components/full-screen-modal.svelte';
@ -13,6 +13,12 @@
const dispatch = createEventDispatcher();
const handleDone = () => dispatch('done');
let canCopyImagesToClipboard = true;
onMount(async () => {
const module = await import('copy-image-clipboard');
canCopyImagesToClipboard = module.canCopyImagesToClipboard();
});
const handleCopy = async () => {
try {
await navigator.clipboard.writeText(secret);
@ -55,7 +61,9 @@
</div>
<div class="flex w-full px-4 gap-4 mt-8">
<Button on:click={() => handleCopy()} fullwidth>Copy to Clipboard</Button>
{#if canCopyImagesToClipboard}
<Button on:click={() => handleCopy()} fullwidth>Copy to Clipboard</Button>
{/if}
<Button on:click={() => handleDone()} fullwidth>Done</Button>
</div>
</div>

11
web/src/lib/components/shared-components/create-share-link-modal/create-shared-link-modal.svelte
View file

@ -31,7 +31,7 @@
let showExif = true;
let expirationTime = '';
let shouldChangeExpirationTime = false;
let canCopyImagesToClipboard = true;
const dispatch = createEventDispatcher();
const expiredDateOption: ImmichDropDownOption = {
@ -39,7 +39,7 @@
options: ['Never', '30 minutes', '1 hour', '6 hours', '1 day', '7 days', '30 days']
};
onMount(() => {
onMount(async () => {
if (editingLink) {
if (editingLink.description) {
description = editingLink.description;
@ -48,6 +48,9 @@
allowDownload = editingLink.allowDownload;
showExif = editingLink.showExif;
}
const module = await import('copy-image-clipboard');
canCopyImagesToClipboard = module.canCopyImagesToClipboard();
});
const handleCreateSharedLink = async () => {
@ -247,7 +250,9 @@
<div class="flex w-full gap-4">
<input class="immich-form-input w-full" bind:value={sharedLink} disabled />
<Button on:click={() => handleCopy()}>Copy</Button>
{#if canCopyImagesToClipboard}
<Button on:click={() => handleCopy()}>Copy</Button>
{/if}
</div>
{/if}
</section>