haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do that attr thing properly

Browse Source
This commit is contained in:
Michael Snoyman 2012-10-24 17:38:15 +02:00
parent f8497c3a22
commit 49baf17b78
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yesod-form/Yesod/Form/Fields.hs
View File

@ -327,7 +327,7 @@ selectFieldList = selectField . optionsPairs
selectField :: (Eq a, RenderMessage master FormMessage) => GHandler sub master (OptionList a) -> Field sub master a selectField :: (Eq a, RenderMessage master FormMessage) => GHandler sub master (OptionList a) -> Field sub master a
selectField = selectFieldHelper selectField = selectFieldHelper
(\theId name inside -> [whamlet| (\theId name attrs inside -> [whamlet|
$newline never $newline never
<select ##{theId} name=#{name} *{attrs}>^{inside} <select ##{theId} name=#{name} *{attrs}>^{inside}
|]) -- outside |]) -- outside
@ -335,7 +335,7 @@ $newline never
$newline never $newline never
<option value=none :isSel:selected>_{MsgSelectNone} <option value=none :isSel:selected>_{MsgSelectNone}
|]) -- onOpt |]) -- onOpt
(\_theId _name attrs value isSel text -> [whamlet| (\_theId _name _attrs value isSel text -> [whamlet|
$newline never $newline never
<option value=#{value} :isSel:selected>#{text} <option value=#{value} :isSel:selected>#{text}
|]) -- inside |]) -- inside
@ -374,7 +374,7 @@ radioFieldList = radioField . optionsPairs
radioField :: (Eq a, RenderMessage master FormMessage) => GHandler sub master (OptionList a) -> Field sub master a radioField :: (Eq a, RenderMessage master FormMessage) => GHandler sub master (OptionList a) -> Field sub master a
radioField = selectFieldHelper radioField = selectFieldHelper
(\theId _name inside -> [whamlet| (\theId _name _attrs inside -> [whamlet|
$newline never $newline never
<div ##{theId}>^{inside} <div ##{theId}>^{inside}
|]) |])
@ -494,7 +494,7 @@ optionsPersist filts ords toDisplay = fmap mkOptionList $ do
selectFieldHelper selectFieldHelper
:: (Eq a, RenderMessage master FormMessage) :: (Eq a, RenderMessage master FormMessage)
=> (Text -> Text -> GWidget sub master () -> GWidget sub master ()) => (Text -> Text -> [(Text, Text)] -> GWidget sub master () -> GWidget sub master ())
-> (Text -> Text -> Bool -> GWidget sub master ()) -> (Text -> Text -> Bool -> GWidget sub master ())
-> (Text -> Text -> [(Text, Text)] -> Text -> Bool -> Text -> GWidget sub master ()) -> (Text -> Text -> [(Text, Text)] -> Text -> Bool -> Text -> GWidget sub master ())
-> GHandler sub master (OptionList a) -> Field sub master a -> GHandler sub master (OptionList a) -> Field sub master a
@ -504,7 +504,7 @@ selectFieldHelper outside onOpt inside opts' = Field
return $ selectParser opts x return $ selectParser opts x
, fieldView = \theId name attrs val isReq -> do , fieldView = \theId name attrs val isReq -> do
opts <- fmap olOptions $ lift opts' opts <- fmap olOptions $ lift opts'
outside theId name $ do outside theId name attrs $ do
unless isReq $ onOpt theId name $ not $ render opts val `elem` map optionExternalValue opts unless isReq $ onOpt theId name $ not $ render opts val `elem` map optionExternalValue opts
flip mapM_ opts $ \opt -> inside flip mapM_ opts $ \opt -> inside
theId theId