904fc5a · elk · git.iko.soy

ui/terminal/src/Develop.hs+2−2

compare with master

unifiedsplit

@@ -98,7 +98,7 @@ error404 :: Snap ()

98error404 =

99 do modifyResponse $ setResponseStatus 404 "Not Found"

100 modifyResponse $ setContentType "text/html; charset=utf-8"

101− writeBuilder $ Generate.makePageHtml "NotFound" ""

101+ writeBuilder $ Generate.makePageHtml "NotFound" Nothing

102

103

104

@@ -173,7 +173,7 @@ compileToHtmlBuilder file =

173 result <- takeMVar mvar1

174 case result of

175 Just exit ->

176− return $ Generate.makePageHtml "Errors" (Encode.encode (Exit.toJson exit))

176+ return $ Generate.makePageHtml "Errors" (Just (Exit.toJson exit))

177

178 Nothing ->

179 takeMVar mvar2

ui/terminal/src/Develop/Generate/Help.hs+5−3

@@ -13,13 +13,15 @@ import Data.Monoid ((<>))

13import Text.RawString.QQ (r)

14

15import qualified Elm.Name as N

16+import qualified Json.Encode as Encode

17+

16

18

17

19

18-- PAGES

20-- PAGES

19

21

20

22

21−makePageHtml :: N.Name -> B.Builder -> B.Builder

23+makePageHtml :: N.Name -> Maybe Encode.Value -> B.Builder

22−makePageHtml moduleName flags =

24+makePageHtml moduleName maybeFlags =

23 [r|<!DOCTYPE HTML>

25 [r|<!DOCTYPE HTML>

24<html>

26<html>

25<head>

27<head>

@@ -29,7 +31,7 @@ makePageHtml moduleName flags =

29</head>

31</head>

30<body>

32<body>

31<script>

33<script>

32−Elm.|] <> N.toBuilder moduleName <> [r|.init({ flags: |] <> flags <> [r| });

34+Elm.|] <> N.toBuilder moduleName <> [r|.init({ flags: |] <> maybe "undefined" Encode.encode maybeFlags <> [r| });

33</script>

35</script>

34</body>

36</body>

35</html>

37</html>

ui/terminal/src/Develop/Generate/Index.hs+1−1

@@ -31,7 +31,7 @@ import qualified Stuff.Verify as Verify

31get :: FilePath -> FilePath -> IO B.Builder

32get root pwd =

33 do flags <- getFlags root pwd

34− return $ Help.makePageHtml "Index" (E.encode (encode flags))

34+ return $ Help.makePageHtml "Index" (Just (encode flags))

35

36

37