fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove isDynamic from modal.hamlet & minor cleanup

Browse Source
This commit is contained in:
Gregor Kleen 2019-04-10 23:09:54 +02:00
parent 1dc322aeac
commit f4ed279a15
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Utils/Modal.hs
View File

@ -7,7 +7,6 @@ module Utils.Modal
import ClassyPrelude.Yesod import ClassyPrelude.Yesod
import Control.Lens import Control.Lens
import Control.Lens.Extras (is)
import Utils.Route import Utils.Route
import Settings (widgetFile) import Settings (widgetFile)
@ -22,12 +21,11 @@ data Modal site = Modal
customModal :: Modal site -> WidgetT site IO () customModal :: Modal site -> WidgetT site IO ()
customModal Modal{..} = do customModal Modal{..} = do
let isDynamic = is _Left modalContent
triggerId' <- maybe newIdent return modalTriggerId triggerId' <- maybe newIdent return modalTriggerId
$(widgetFile "widgets/modal/modal") $(widgetFile "widgets/modal/modal")
route <- for (modalContent ^? _Left) toTextUrl route <- traverse toTextUrl $ modalContent ^? _Left
modalTrigger route triggerId' modalTrigger route triggerId'
-- | Create a link to a modal -- | Create a link to a modal

2
templates/widgets/modal/modal.hamlet
View File

@ -1,5 +1,5 @@
$newline never $newline never
<div uw-modal data-modal-trigger=##{triggerId'} data-modal-closeable :isDynamic:.not-used> <div uw-modal data-modal-trigger=##{triggerId'} data-modal-closeable>
$case modalContent $case modalContent
$of Right content $of Right content
<div .modal__content> <div .modal__content>