diff --git a/pt/web/firebird/package-lock.json b/pt/web/firebird/package-lock.json index e1fa569d8..eb323fda5 100644 --- a/pt/web/firebird/package-lock.json +++ b/pt/web/firebird/package-lock.json @@ -1507,7 +1507,7 @@ }, "node_modules/firebird-common": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/hathitrust/firebird-common.git#32b911b6c256a046f4792f4c0435d921d881ec7f", + "resolved": "git+ssh://git@github.com/hathitrust/firebird-common.git#4529a09a1e0d5c3823787181dbe8975fd34ca2ce", "license": "BSD-3-Clause", "dependencies": { "@popperjs/core": "^2.11.6", @@ -1515,6 +1515,9 @@ "bootstrap": "^5.2.3", "dialog-polyfill": "^0.5.6", "svelte-preprocess": "^6.0.3" + }, + "optionalDependencies": { + "@esbuild/linux-x64": "0.17.15" } }, "node_modules/fsevents": { diff --git a/pt/web/firebird/src/js/components/AccessStatusPanel/EmergencyAccessAffiliate.svelte b/pt/web/firebird/src/js/components/AccessStatusPanel/EmergencyAccessAffiliate.svelte index 5a8ca6271..e86c2bad8 100644 --- a/pt/web/firebird/src/js/components/AccessStatusPanel/EmergencyAccessAffiliate.svelte +++ b/pt/web/firebird/src/js/components/AccessStatusPanel/EmergencyAccessAffiliate.svelte @@ -40,7 +40,7 @@ - + Checked out until {expiresDisplay} diff --git a/pt/web/firebird/src/js/components/AccessStatusPanel/EnhancedTextUser.svelte b/pt/web/firebird/src/js/components/AccessStatusPanel/EnhancedTextUser.svelte index 1a86f8a59..54f457257 100644 --- a/pt/web/firebird/src/js/components/AccessStatusPanel/EnhancedTextUser.svelte +++ b/pt/web/firebird/src/js/components/AccessStatusPanel/EnhancedTextUser.svelte @@ -11,7 +11,7 @@ - + In-Copyright Access

diff --git a/pt/web/firebird/src/js/components/AccessStatusPanel/InLibraryUser.svelte b/pt/web/firebird/src/js/components/AccessStatusPanel/InLibraryUser.svelte index 678d1b8a0..09d18f3b2 100644 --- a/pt/web/firebird/src/js/components/AccessStatusPanel/InLibraryUser.svelte +++ b/pt/web/firebird/src/js/components/AccessStatusPanel/InLibraryUser.svelte @@ -39,7 +39,7 @@ - + Checked out until {expiresDisplay} diff --git a/pt/web/firebird/src/js/components/AccessStatusPanel/ResourceSharingUser.svelte b/pt/web/firebird/src/js/components/AccessStatusPanel/ResourceSharingUser.svelte index a3304c15c..71086d69d 100644 --- a/pt/web/firebird/src/js/components/AccessStatusPanel/ResourceSharingUser.svelte +++ b/pt/web/firebird/src/js/components/AccessStatusPanel/ResourceSharingUser.svelte @@ -6,7 +6,7 @@ - + Registered Access via Resource Sharing diff --git a/pt/web/firebird/src/js/components/AccessStatusPanel/TotalAccessUser.svelte b/pt/web/firebird/src/js/components/AccessStatusPanel/TotalAccessUser.svelte index 6e56fd32f..c14a23538 100644 --- a/pt/web/firebird/src/js/components/AccessStatusPanel/TotalAccessUser.svelte +++ b/pt/web/firebird/src/js/components/AccessStatusPanel/TotalAccessUser.svelte @@ -10,7 +10,7 @@ - + {#if accessType.role == 'ht_staff_user' || accessType.role == 'ht_total_user'} Collection Administration Access diff --git a/pt/web/firebird/src/js/components/CollectionsPanel/index.svelte b/pt/web/firebird/src/js/components/CollectionsPanel/index.svelte index 646bde4d3..ecab9b925 100644 --- a/pt/web/firebird/src/js/components/CollectionsPanel/index.svelte +++ b/pt/web/firebird/src/js/components/CollectionsPanel/index.svelte @@ -144,7 +144,7 @@ - + Collections {#if userIsAnonymous} diff --git a/pt/web/firebird/src/js/components/DownloadPanel/index.svelte b/pt/web/firebird/src/js/components/DownloadPanel/index.svelte index ee26adfa4..bb7862318 100644 --- a/pt/web/firebird/src/js/components/DownloadPanel/index.svelte +++ b/pt/web/firebird/src/js/components/DownloadPanel/index.svelte @@ -33,6 +33,7 @@ let tunnelFormTracker; let tunnelFormAttempt = 0; let downloadInProgress = false; + let cancellingDownload = false; let trackerInterval; let progressUrl, downloadUrl, totalPages; let lastPercent; @@ -66,6 +67,7 @@ clearInterval(trackerInterval); trackerInterval = null; modal.hide(); + document.getElementById('submit-download').focus(); } } @@ -140,6 +142,7 @@ clearInterval(trackerInterval); trackerInterval = null; } + document.getElementById('submit-download').focus(); // but we are not exiting!! } @@ -149,6 +152,8 @@ return; } + cancellingDownload = true; + let cancelUrl = new URL(`${location.protocol}//${HT.service_domain}${action}`); let params = new URLSearchParams(); params.set('id', manifest.id); @@ -164,6 +169,9 @@ tunnelWindow.document.body.appendChild(scriptEl); console.log('-- download.cancelDownload'); + setTimeout(() => { + cancellingDownload = false; + }, 1000); } function submitDownload() { @@ -341,12 +349,13 @@ } let flattenedSelection = []; - + $: clearSelectionLabel = 'Clear selection'; $: action = buildAction(format, range, targetPPI); $: if ((format == 'plaintext-zip' || format == 'epub') && range != 'volume') { range = 'volume'; } $: if (flattenSelection($selected)) { + clearSelectionLabel = `Clear selected scans: ${flattenedSelection.join(', ')}`; range = 'selected-pages'; } $: meta = manifest.meta($currentSeq); @@ -590,8 +599,8 @@ - - {#if downloadInProgress} - - Download - - {:else} - modal.hide()} - href={downloadUrl}>Download + {#if downloadInProgress} + Download + {:else} + modal.hide()} + on:click={() => document.getElementById('submit-download').focus()} + href={downloadUrl}>Download + {/if} + + {#if cancellingDownload} + Download cancelled {/if} - {/snippet} + {/snippet}