content disposition tweaks (attachment by default, ui target=_blank)

feat/vaults
Tomáš Mládek 2022-02-03 16:34:35 +01:00
parent 7673f6d74a
commit faed70fe03
No known key found for this signature in database
GPG Key ID: ED21612889E75EC5
3 changed files with 10 additions and 8 deletions

View File

@ -72,14 +72,16 @@ pub async fn get_raw(
let file_path = state.upend.vault_path.join(&file.path);
if query.native.is_none() {
Ok(Either::A(if query.inline.is_some() {
Ok(Either::A(
NamedFile::open(file_path)?.set_content_disposition(ContentDisposition {
disposition: DispositionType::Inline,
disposition: if query.inline.is_some() {
DispositionType::Inline
} else {
DispositionType::Attachment
},
parameters: vec![],
})
} else {
NamedFile::open(file_path)?
}))
}),
))
} else if state.desktop_enabled {
#[cfg(feature = "desktop")]
{

View File

@ -37,7 +37,7 @@
/>
{/if}
{#if mimeType?.startsWith("image")}
<a target="_blank" href="/api/raw/{address}">
<a target="_blank" href="/api/raw/{address}?inline=1">
{#if imageLoaded != address}
<Spinner />
{/if}

View File

@ -88,7 +88,7 @@
<div class="separator" />
<div class="label" class:resolving title={displayLabel}>
{#if banner && isFile}
<a href="/api/raw/{address}" target="_blank">
<a href="/api/raw/{address}">
<Ellipsis value={displayLabel} />
</a>
{:else if link}