@@ -30,6 +30,7 @@ api = Proxy
3030
3131main :: IO ()
3232main = mainWidget $ do
33+ el "h1" $ text "Wowzers!"
3334 divClass "example-base" run
3435 divClass "example-multi" runMulti
3536
@@ -64,9 +65,9 @@ runMulti = do
6465 grts <- fmap (fmap T.words . value) $ divClass "" $ do
6566 text "Greetings"
6667 textInput def
67− gust <- fmap (value) $ divClass "gusto-input" $ checkbox False def
68+ gust <- fmap value $ divClass "gusto-input" $ checkbox False def
6869 b <- button "Go"
69− r' <- sayHi (fmap QParamSome <$> nms) (fmap (:[]) $ grts) (constDyn [True, False]) (1 <$ b)
70+ r' <- sayHi (fmap QParamSome <$> nms) (fmap (:[]) grts) (constDyn [True, False]) (1 <$ b)
7071
7172 dynText =<< holdDyn "Waiting" (T.pack . show . catMaybes . fmap reqSuccess <$> r')
7273
@@ -103,11 +104,11 @@ run = mdo
103104 unitResponse <- getUnit $ tag (current reqCount) unitBtn
104105 intResponse :: Event t (ReqResult Int Int) <- getInt $ tag (current reqCount) intBtn
105106
106− score <- foldDyn (+) 0 (fmapMaybe reqSuccess (intResponse))
107+ score <- foldDyn (+) 0 (fmapMaybe reqSuccess intResponse)
107108
108− r <- holdDyn "Waiting" $ fmap showXhrResponse $
109− leftmost [fmapMaybe response (unitResponse)
110− ,fmapMaybe response (intResponse)
109+ r <- holdDyn "Waiting" $ showXhrResponse <$>
110+ leftmost [fmapMaybe response unitResponse
111+ ,fmapMaybe response intResponse
111112 ]
112113 divClass "unit-int-response" $ el "p" $ dynText r >> el "br" (return ()) >> text "Total: " >> display score
113114 return (unitBtn, intBtn)
@@ -116,14 +117,14 @@ run = mdo
116117
117118 text "Name"
118119 el "br" $ return ()
119− inp :: Dynamic t Text <- fmap value $ divClass "name-input" $ (textInput def)
120+ inp :: Dynamic t Text <- fmap value $ divClass "name-input" $ textInput def
120121 let checkedName = fmap (\i -> bool (QParamSome i) (QParamInvalid "Need a name") (T.null i)) inp
121122 el "br" $ return ()
122123
123124 text "Greetings (space-separated)"
124125 el "br" $ return ()
125126 greetings <- fmap (fmap T.words . value) $
126− divClass "greetings-input" $ (textInput def)
127+ divClass "greetings-input" $ textInput def
127128
128129 el "br" $ return ()
129130
@@ -135,23 +136,23 @@ run = mdo
135136
136137 resp <- sayhi checkedName greetings gusto (tag (current reqCount) triggers)
137138 divClass "greeting-response" $ dynText =<<
138− holdDyn "No hi yet" (leftmost [ fmapMaybe reqSuccess (resp)
139− , fmapMaybe reqFailure (resp)])
139+ holdDyn "No hi yet" (leftmost [ fmapMaybe reqSuccess resp
140+ , fmapMaybe reqFailure resp])
140141 return sayHiClicks
141142
142143 dblBtn <- elClass "div" "demo-group" $ do
143144 text "A Double to double"
144145 el "br" $ return ()
145146 dblinp <- fmap value $ divClass "double-input" $ textInput def
146− (dblBtn) <- divClass "double-button" $ button "Double it"
147− dblResp <- dbl (fmap (note "read failure" . readMaybe . T.unpack) $
147+ dblBtn <- divClass "double-button" $ button "Double it"
148+ dblResp <- dbl ((note "read failure" . readMaybe . T.unpack) <$>
148149 dblinp) (tag (current reqCount) dblBtn)
149150 divClass "double-errors" $ dynText =<<
150− holdDyn "(no errors)" (fmapMaybe reqFailure (dblResp))
151+ holdDyn "(no errors)" (fmapMaybe reqFailure dblResp)
151152 el "br" (return ())
152153 divClass "double-result" $ el "p" $ dynText =<<
153− holdDyn "No number yet" (fmap tShow $
154− fmapMaybe reqSuccess (dblResp))
154+ holdDyn "No number yet" (tShow <$>
155+ fmapMaybe reqSuccess dblResp)
155156 return dblBtn
156157
157158 mpGo <- elClass "div" "demo-group" $ do
@@ -159,9 +160,9 @@ run = mdo
159160 b <- value <$> checkbox False def
160161 mpGo <- button "Test"
161162 multiResp <- multi b (tag (current reqCount) mpGo)
162− dynText =<< holdDyn "No res yet" (fmap tShow $
163− fmapMaybe reqSuccess $
164− (multiResp))
163+ dynText =<< holdDyn "No res yet" (tShow <$>
164+ fmapMaybe reqSuccess
165+ multiResp)
165166 return mpGo
166167
167168 return ()
@@ -171,7 +172,7 @@ run = mdo
171172 elClass "div" "demo-group" $ do
172173 text "JSON Unicode encoding test"
173174 txt <- value <$> textInput def
174− ev <- fmap (1 <$) $ button "Question"
175+ ev <- (1 <$) <$> button "Question"
175176 let dQ = Right . Question <$> traceDyn "will send: " txt
176177 rr <- qna dQ ev
177178 el "p" $