diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.6.0 + +* Upgrade to yesod-core 1.6.0 + ## 1.4.16 * Korean translation diff --git a/Yesod/Form/Bootstrap3.hs b/Yesod/Form/Bootstrap3.hs --- a/Yesod/Form/Bootstrap3.hs +++ b/Yesod/Form/Bootstrap3.hs @@ -186,7 +186,7 @@ -- | (Internal) Render a help widget for tooltips and errors. -helpWidget :: FieldView site -> WidgetT site IO () +helpWidget :: FieldView site -> WidgetFor site () helpWidget view = [whamlet| $maybe tt <- fvTooltip view #{tt} diff --git a/Yesod/Form/Fields.hs b/Yesod/Form/Fields.hs --- a/Yesod/Form/Fields.hs +++ b/Yesod/Form/Fields.hs @@ -161,10 +161,9 @@ } where showVal = either id (pack . show) --- | An alias for 'timeFieldTypeText'. +-- | An alias for 'timeFieldTypeTime'. timeField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m TimeOfDay -timeField = timeFieldTypeText -{-# DEPRECATED timeField "'timeField' currently defaults to an input of type=\"text\". In the next major release, it will default to type=\"time\". To opt in to the new functionality, use 'timeFieldTypeTime'. To keep the existing behavior, use 'timeFieldTypeText'. See 'https://github.com/yesodweb/yesod/pull/874' for details." #-} +timeField = timeFieldTypeTime -- | Creates an input with @type="time"@. will fallback to a text field, and Yesod will parse the time as described in 'timeFieldTypeText'. -- @@ -175,6 +174,8 @@ timeFieldTypeTime = timeFieldOfType "time" -- | Creates an input with @type="text"@, parsing the time from an [H]H:MM[:SS] format, with an optional AM or PM (if not given, AM is assumed for compatibility with the 24 hour clock system). +-- +-- This function exists for backwards compatibility with the old implementation of 'timeField', which used to use @type="text"@. Consider using 'timeField' or 'timeFieldTypeTime' for improved UX and validation from the browser. -- -- Add the @time@ package and import the "Data.Time.LocalTime" module to use this function. -- @@ -420,15 +421,15 @@ -- > areq (selectFieldList [("Value 1" :: Text, "value1"),("Value 2", "value2")]) "Which value?" Nothing selectFieldList :: (Eq a, RenderMessage site FormMessage, RenderMessage site msg) => [(msg, a)] - -> Field (HandlerT site IO) a + -> Field (HandlerFor site) a selectFieldList = selectField . optionsPairs -- | Creates a @\@ tag for selecting multiple options. multiSelectFieldList :: (Eq a, RenderMessage site msg) => [(msg, a)] - -> Field (HandlerT site IO) [a] + -> Field (HandlerFor site) [a] multiSelectFieldList = multiSelectField . optionsPairs -- | Creates a @\. let fragment' = @@ -418,7 +418,7 @@ type FormRender m a = AForm m a -> Html - -> MForm m (FormResult a, WidgetT (HandlerSite m) IO ()) + -> MForm m (FormResult a, WidgetFor (HandlerSite m) ()) renderTable, renderDivs, renderDivsNoLabels :: Monad m => FormRender m a -- | Render a form into a series of tr tags. Note that, in order to allow diff --git a/Yesod/Form/Jquery.hs b/Yesod/Form/Jquery.hs --- a/Yesod/Form/Jquery.hs +++ b/Yesod/Form/Jquery.hs @@ -53,16 +53,16 @@ urlJqueryUiDateTimePicker :: a -> Either (Route a) Text urlJqueryUiDateTimePicker _ = Right "http://github.com/gregwebs/jquery.ui.datetimepicker/raw/master/jquery.ui.datetimepicker.js" -jqueryDayField :: (RenderMessage site FormMessage, YesodJquery site) => JqueryDaySettings -> Field (HandlerT site IO) Day +jqueryDayField :: (RenderMessage site FormMessage, YesodJquery site) => JqueryDaySettings -> Field (HandlerFor site) Day jqueryDayField = flip jqueryDayField' "date" -- | Use jQuery's datepicker as the underlying implementation. -- -- Since 1.4.3 -jqueryDatePickerDayField :: (RenderMessage site FormMessage, YesodJquery site) => JqueryDaySettings -> Field (HandlerT site IO) Day +jqueryDatePickerDayField :: (RenderMessage site FormMessage, YesodJquery site) => JqueryDaySettings -> Field (HandlerFor site) Day jqueryDatePickerDayField = flip jqueryDayField' "text" -jqueryDayField' :: (RenderMessage site FormMessage, YesodJquery site) => JqueryDaySettings -> Text -> Field (HandlerT site IO) Day +jqueryDayField' :: (RenderMessage site FormMessage, YesodJquery site) => JqueryDaySettings -> Text -> Field (HandlerFor site) Day jqueryDayField' jds inputType = Field { fieldParse = parseHelper $ maybe (Left MsgInvalidDay) @@ -107,13 +107,13 @@ ] jqueryAutocompleteField :: (RenderMessage site FormMessage, YesodJquery site) - => Route site -> Field (HandlerT site IO) Text + => Route site -> Field (HandlerFor site) Text jqueryAutocompleteField = jqueryAutocompleteField' 2 jqueryAutocompleteField' :: (RenderMessage site FormMessage, YesodJquery site) => Int -- ^ autocomplete minimum length -> Route site - -> Field (HandlerT site IO) Text + -> Field (HandlerFor site) Text jqueryAutocompleteField' minLen src = Field { fieldParse = parseHelper $ Right , fieldView = \theId name attrs val isReq -> do diff --git a/Yesod/Form/MassInput.hs b/Yesod/Form/MassInput.hs --- a/Yesod/Form/MassInput.hs +++ b/Yesod/Form/MassInput.hs @@ -2,7 +2,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE CPP#-} +{-# LANGUAGE CPP #-} -- | A module providing a means of creating multiple input forms, such as a -- list of 0 or more recipients. module Yesod.Form.MassInput @@ -44,17 +44,17 @@ -- | Generate a form that accepts 0 or more values from the user, allowing the -- user to specify that a new row is necessary. -inputList :: (xml ~ WidgetT site IO (), RenderMessage site FormMessage) +inputList :: (xml ~ WidgetFor site (), RenderMessage site FormMessage) => Html -- ^ label for the form -> ([[FieldView site]] -> xml) -- ^ how to display the rows, usually either 'massDivs' or 'massTable' - -> (Maybe a -> AForm (HandlerT site IO) a) + -> (Maybe a -> AForm (HandlerFor site) a) -- ^ display a single row of the form, where @Maybe a@ gives the -- previously submitted value -> Maybe [a] -- ^ default initial values for the form - -> AForm (HandlerT site IO) [a] + -> AForm (HandlerFor site) [a] inputList label fixXml single mdef = formToAForm $ do theId <- lift newIdent down 1 @@ -94,9 +94,9 @@ , fvRequired = False }]) -withDelete :: (xml ~ WidgetT site IO (), RenderMessage site FormMessage) - => AForm (HandlerT site IO) a - -> MForm (HandlerT site IO) (Either xml (FormResult a, [FieldView site])) +withDelete :: (xml ~ WidgetFor site (), RenderMessage site FormMessage) + => AForm (HandlerFor site) a + -> MForm (HandlerFor site) (Either xml (FormResult a, [FieldView site])) withDelete af = do down 1 deleteName <- newFormIdent @@ -129,7 +129,7 @@ massDivs, massTable :: [[FieldView site]] - -> WidgetT site IO () + -> WidgetFor site () massDivs viewss = [whamlet| $newline never $forall views <- viewss diff --git a/Yesod/Form/Nic.hs b/Yesod/Form/Nic.hs --- a/Yesod/Form/Nic.hs +++ b/Yesod/Form/Nic.hs @@ -29,7 +29,7 @@ urlNicEdit :: a -> Either (Route a) Text urlNicEdit _ = Right "http://js.nicedit.com/nicEdit-latest.js" -nicHtmlField :: YesodNic site => Field (HandlerT site IO) Html +nicHtmlField :: YesodNic site => Field (HandlerFor site) Html nicHtmlField = Field { fieldParse = \e _ -> return . Right . fmap (preEscapedToMarkup . sanitizeBalance) . listToMaybe $ e , fieldView = \theId name attrs val _isReq -> do diff --git a/Yesod/Form/Types.hs b/Yesod/Form/Types.hs --- a/Yesod/Form/Types.hs +++ b/Yesod/Form/Types.hs @@ -189,7 +189,7 @@ { fvLabel :: Html , fvTooltip :: Maybe Html , fvId :: Text - , fvInput :: WidgetT site IO () + , fvInput :: WidgetFor site () , fvErrors :: Maybe Html , fvRequired :: Bool } @@ -200,7 +200,7 @@ -> [(Text, Text)] -- ^ Attributes -> Either Text a -- ^ Either (invalid text) or (legitimate result) -> Bool -- ^ Required? - -> WidgetT (HandlerSite m) IO () + -> WidgetFor (HandlerSite m) () data Field m a = Field { fieldParse :: [Text] -> [FileInfo] -> m (Either (SomeMessage (HandlerSite m)) (Maybe a)) diff --git a/yesod-form.cabal b/yesod-form.cabal --- a/yesod-form.cabal +++ b/yesod-form.cabal @@ -1,5 +1,5 @@ name: yesod-form -version: 1.4.16 +version: 1.6.0 license: MIT license-file: LICENSE author: Michael Snoyman @@ -20,8 +20,8 @@ library build-depends: base >= 4 && < 5 - , yesod-core >= 1.4.14 && < 1.5 - , yesod-persistent >= 1.4 && < 1.5 + , yesod-core >= 1.6 && < 1.7 + , yesod-persistent >= 1.6 && < 1.7 , time >= 1.1.4 , shakespeare >= 2.0 , persistent