80904ba · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

A bit more linting

commit80904ba8ddefd4d35a0379901a6cbd225eeb9b11 authorRyan Trinkle <ryan.trinkle@gmail.com> dateSun 17 Jul 2016, 12:09 (10 years ago) parentbadd5df

6 files changed+15−18

compare with develop

unifiedsplit

src/Reflex/Dom/Builder/Static.hs+1−1 src/Reflex/Dom/Time.hs+1−1 src/Reflex/Dom/Widget/Basic.hs+1−1 src/Reflex/Dom/Widget/Input.hs+1−1 test/BrokenHaltSpec.hs+3−4 test/HaltSpec.hs+8−10

src/Reflex/Dom/Builder/Static.hs+1−1

@@ -124,7 +124,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh

124124 let tagBS = encodeUtf8 elementTag

125125 let open = mconcat [constant ("<" <> tagBS <> " "), attrs1, constant ">"]

126126 let close = constant $ "</" <> tagBS <> ">" -- TODO handle elements without closing tags

127− modify $ (:) $ mconcat $ [open, innerHtml, close]

127+ modify $ (:) $ mconcat [open, innerHtml, close]

128128 return (Element es (error "Static.element RawElement was used"), result)

129129

130130 {-# INLINABLE placeholder #-}

src/Reflex/Dom/Time.hs+1−1

@@ -158,7 +158,7 @@ inhomogeneousPoissonFrom rnd rate maxRate t0 e = do

158158 tTarget = addUTCTime dt tTargetLast

159159 thisDelay = realToFrac $ diffUTCTime tTarget t :: Double

160160 threadDelay $ ceiling $ thisDelay * 1000000

161− void $ cb $ (TickInfo t nEvents alreadyElapsed, p)

161+ _ <- cb (TickInfo t nEvents alreadyElapsed, p)

162162 go tTarget nextGen' cb nEvents

163163

164164-- | Send events with inhomogeneous Poisson timing with the given basis

src/Reflex/Dom/Widget/Basic.hs+1−1

@@ -354,7 +354,7 @@ divClass = elClass "div"

354354dtdd :: forall t m a. DomBuilder t m => Text -> m a -> m a

355355dtdd h w = do

356356 el "dt" $ text h

357− el "dd" $ w

357+ el "dd" w

358358

359359blank :: forall m. Monad m => m ()

360360blank = return ()

src/Reflex/Dom/Widget/Input.hs+1−1

@@ -293,7 +293,7 @@ fileInput config = do

293293 eChange <- wrapDomEvent e (`on` Element.change) $ do

294294 Just files <- Input.getFiles e

295295 len <- FileList.getLength files

296− mapM (fmap (fromMaybe (error "fileInput: fileList.item returned null")) . FileList.item files) $ [0 .. len-1]

296+ mapM (fmap (fromMaybe (error "fileInput: fileList.item returned null")) . FileList.item files) [0 .. len-1]

297297 dValue <- holdDyn [] eChange

298298 return $ FileInput

299299 { _fileInput_value = dValue

test/BrokenHaltSpec.hs+3−4

@@ -34,7 +34,6 @@ getFirstEventAndHalt action = do

3434 return ()

3535

3636haltGui :: WebView -> IO ()

37−haltGui wv = do

38− Gtk.postGUIAsync $ do

39− w <- Gtk.widgetGetToplevel wv

40− Gtk.widgetDestroy w

37+haltGui wv = Gtk.postGUIAsync $ do

38+ w <- Gtk.widgetGetToplevel wv

39+ Gtk.widgetDestroy w

test/HaltSpec.hs+8−10

@@ -7,23 +7,21 @@ import qualified Graphics.UI.Gtk as Gtk

77import Reflex.Dom

88import Reflex.Spider.Internal (SpiderHostFrame)

10+main :: IO ()

1011main = do

1112 getFirstEventAndHalt return

1213 putStrLn "stopped once"

1314

14− forM_ [1 .. 1000] $ \ i -> do

15− getFirstEventAndHalt return

15+ forM_ [1 .. 1000] $ \i -> getFirstEventAndHalt return

1616 putStrLn "stopped many times"

1717

1818type SpiderM = Widget Spider (Gui Spider (WithWebView SpiderHost) SpiderHostFrame)

1919

2020getFirstEventAndHalt :: (Event Spider () -> SpiderM (Event Spider ())) -> IO ()

21−getFirstEventAndHalt action = do

22− _ <- mainWidget $ do

23− tick <- getPostBuild

24− event <- action tick

25− webView <- askWebView

26− quit <- getQuitWidget

27− performEvent_ (quit <$ event)

28− return ()

21+getFirstEventAndHalt action = mainWidget $ do

22+ tick <- getPostBuild

23+ event <- action tick

24+ webView <- askWebView

25+ quit <- getQuitWidget

26+ performEvent_ (quit <$ event)

2927 return ()