From 49baf17b7881166483ee8221d868693a2a675bb4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 24 Oct 2012 17:38:15 +0200
Subject: [PATCH] Do that attr thing properly

---
 yesod-form/Yesod/Form/Fields.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 1acb3ecb..53c2af42 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -327,7 +327,7 @@ selectFieldList = selectField . optionsPairs
 
 selectField :: (Eq a, RenderMessage master FormMessage) => GHandler sub master (OptionList a) -> Field sub master a
 selectField = selectFieldHelper
-    (\theId name inside -> [whamlet|
+    (\theId name attrs inside -> [whamlet|
 $newline never
 <select ##{theId} name=#{name} *{attrs}>^{inside}
 |]) -- outside
@@ -335,7 +335,7 @@ $newline never
 $newline never
 <option value=none :isSel:selected>_{MsgSelectNone}
 |]) -- onOpt
-    (\_theId _name attrs value isSel text -> [whamlet|
+    (\_theId _name _attrs value isSel text -> [whamlet|
 $newline never
 <option value=#{value} :isSel:selected>#{text}
 |]) -- inside
@@ -374,7 +374,7 @@ radioFieldList = radioField . optionsPairs
 
 radioField :: (Eq a, RenderMessage master FormMessage) => GHandler sub master (OptionList a) -> Field sub master a
 radioField = selectFieldHelper
-    (\theId _name inside -> [whamlet|
+    (\theId _name _attrs inside -> [whamlet|
 $newline never
 <div ##{theId}>^{inside}
 |])
@@ -494,7 +494,7 @@ optionsPersist filts ords toDisplay = fmap mkOptionList $ do
 
 selectFieldHelper
         :: (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 -> [(Text, Text)] -> Text -> Bool -> Text -> GWidget sub master ())
         -> GHandler sub master (OptionList a) -> Field sub master a
@@ -504,7 +504,7 @@ selectFieldHelper outside onOpt inside opts' = Field
         return $ selectParser opts x
     , fieldView = \theId name attrs val isReq -> do
         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
             flip mapM_ opts $ \opt -> inside
                 theId