TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-04 06:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix edit notes rendering

Browse Source 
It must be outside the iframe tree, to not modify it when it
appears/disappears.
This commit is contained in:
Eike Kettner 2020-05-23 19:50:39 +02:00
parent a5ca3b0325
commit b8267f60c1
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/webapp/src/main/elm/Comp/ItemDetail.elm
View File

@ -1165,7 +1165,11 @@ view inav model =
, div
[ classList
[ ( "ui ablue-comp menu", True )
, ( "top attached", model.mailOpen || model.addFilesOpen )
, ( "top attached"
, model.mailOpen
|| model.addFilesOpen
|| isEditNotes model.notesField
)
]
]
[ a [ class "item", Page.href HomePage ]
@ -1248,6 +1252,7 @@ view inav model =
]
, renderMailForm model
, renderAddFilesForm model
, renderNotes model
, div [ class "ui grid" ]
[ Html.map DeleteItemConfirm (Comp.YesNoDimmer.view model.deleteItemConfirm)
, div
@ -1271,8 +1276,7 @@ view inav model =
]
<|
List.concat
[ renderNotes model
, [ renderAttachmentsTabMenu model
[ [ renderAttachmentsTabMenu model
]
, renderAttachmentsTabBody model
, renderIdInfo model
@ -1297,16 +1301,16 @@ renderIdInfo model =
]
renderNotes : Model -> List (Html Msg)
renderNotes : Model -> Html Msg
renderNotes model =
case model.notesField of
HideNotes ->
case model.item.notes of
Nothing ->
[]
span [ class "invisible hidden" ] []
Just _ ->
[ div [ class "ui segment" ]
div [ class "ui segment" ]
[ a
[ class "ui top left attached label"
, onClick ToggleNotes
@ -1316,15 +1320,14 @@ renderNotes model =
, text "Show notes…"
]
]
]
ViewNotes ->
case model.item.notes of
Nothing ->
[]
span [ class "hidden invisible" ] []
Just str ->
[ div [ class "ui segment" ]
div [ class "ui segment" ]
[ Markdown.toHtml [ class "item-notes" ] str
, a
[ class "ui left corner label"
@ -1334,10 +1337,9 @@ renderNotes model =
[ i [ class "eye slash icon" ] []
]
]
]
EditNotes mm ->
[ div [ class "ui segment" ]
div [ class "ui bottom attached segment" ]
[ Html.map NotesEditMsg (Comp.MarkdownInput.view (Maybe.withDefault "" model.notesModel) mm)
, div [ class "ui secondary menu" ]
[ a
@ -1358,7 +1360,6 @@ renderNotes model =
]
]
]
]
attachmentVisible : Model -> Int -> Bool