904fc5a · elk · git.iko.soy

git.iko.soy/elk

cosmetic: make sure "no flags" is given as "undefined"

commit904fc5a1822c29a22f647456cda5b069c09795d2 authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 28 Jun 2018, 20:18 (8 years ago) parente4fc24b

3 files changed+8−6

compare with master

unifiedsplit

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

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

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

9898error404 =

9999 do modifyResponse $ setResponseStatus 404 "Not Found"

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

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

101+ writeBuilder $ Generate.makePageHtml "NotFound" Nothing

102102

103103

104104

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

173173 result <- takeMVar mvar1

174174 case result of

175175 Just exit ->

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

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

177177

178178 Nothing ->

179179 takeMVar mvar2

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

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

1313import Text.RawString.QQ (r)

1414

1515import qualified Elm.Name as N

16+import qualified Json.Encode as Encode

17+

1618

1719

1820-- PAGES

1921

2022

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

22−makePageHtml moduleName flags =

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

24+makePageHtml moduleName maybeFlags =

2325 [r|<!DOCTYPE HTML>

2426<html>

2527<head>

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

2931</head>

3032<body>

3133<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| });

3335</script>

3436</body>

3537</html>

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

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

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

3232get root pwd =

3333 do flags <- getFlags root pwd

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

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

3535

3636

3737