TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 10:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1425 from eikek/fix/pdf-view

Browse Source 
Use iframe for cross-browser pdf view (pdfjs)
This commit is contained in:
mergify[bot]
2022-02-28 11:38:03 +00:00
committed by GitHub
parent d70517ad0e 78448991ca
commit 68a957efe2
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm
View File

@ -85,12 +85,12 @@ view texts flags settings model pos attach =
, style "max-height" "calc(100vh - 140px)" , style "max-height" "calc(100vh - 140px)"
, style "min-height" "500px" , style "min-height" "500px"
] ]
[ embed [ Data.UiSettings.pdfView settings
[ src <| Data.UiSettings.pdfUrl settings flags fileUrl flags
, class "absolute h-full w-full top-0 left-0 mx-0 py-0" fileUrl
[ class "absolute h-full w-full top-0 left-0 mx-0 py-0"
, id "ds-pdf-view-iframe" , id "ds-pdf-view-iframe"
] ]
[]
] ]
] ]

32
modules/webapp/src/main/elm/Data/UiSettings.elm
View File

@ -24,6 +24,7 @@ module Data.UiSettings exposing
, merge , merge
, mergeDefaults , mergeDefaults
, pdfUrl , pdfUrl
, pdfView
, storedUiSettingsDecoder , storedUiSettingsDecoder
, storedUiSettingsEncode , storedUiSettingsEncode
, tagColor , tagColor
@ -41,8 +42,8 @@ import Data.ItemTemplate exposing (ItemTemplate)
import Data.Pdf exposing (PdfMode) import Data.Pdf exposing (PdfMode)
import Data.UiTheme exposing (UiTheme) import Data.UiTheme exposing (UiTheme)
import Dict exposing (Dict) import Dict exposing (Dict)
import Html exposing (Attribute) import Html exposing (Attribute, Html, embed, iframe)
import Html.Attributes as HA import Html.Attributes as HA exposing (src)
import Json.Decode as Decode import Json.Decode as Decode
import Json.Decode.Pipeline as P import Json.Decode.Pipeline as P
import Json.Encode as Encode import Json.Encode as Encode
@ -426,6 +427,33 @@ pdfUrl settings flags originalUrl =
Data.Pdf.serverUrl originalUrl Data.Pdf.serverUrl originalUrl
pdfView : UiSettings -> Flags -> String -> List (Attribute msg) -> Html msg
pdfView settings flags originalUrl attrs =
let
url =
pdfUrl settings flags originalUrl
native =
embed (src url :: attrs) []
fallback =
iframe (src url :: attrs) []
in
case settings.pdfMode of
Data.Pdf.Detect ->
if flags.pdfSupported then
native
else
fallback
Data.Pdf.Native ->
native
Data.Pdf.Server ->
fallback
getUiLanguage : Flags -> UiSettings -> UiLanguage -> UiLanguage getUiLanguage : Flags -> UiSettings -> UiLanguage -> UiLanguage
getUiLanguage flags settings default = getUiLanguage flags settings default =
case flags.account of case flags.account of