git.iko.soy/elk
on master help sign in
Make sure that the user defined module name is used in generated HTML
97ab619Evan Czaplicki
compiler/Compiler.hs+6−6
compare with master
unifiedsplit
@@ -171,7 +171,7 @@ build flags rootFile = do
171 let noPrelude = no_prelude flags
171 let noPrelude = no_prelude flags
172 files <- if make flags then getSortedDependencies noPrelude rootFile else return [rootFile]
172 files <- if make flags then getSortedDependencies noPrelude rootFile else return [rootFile]
173 let ifaces = if noPrelude then Map.empty else Prelude.interfaces
173 let ifaces = if noPrelude then Map.empty else Prelude.interfaces
174− interfaces <- buildFiles flags (length files) ifaces files
174+ (moduleName, interfaces) <- buildFiles flags (length files) ifaces "" files
175 js <- foldM appendToOutput "" files
175 js <- foldM appendToOutput "" files
176 case only_js flags of
176 case only_js flags of
177 True -> do
177 True -> do
@@ -181,7 +181,7 @@ build flags rootFile = do
181 False -> do
181 False -> do
182 putStr "Generating HTML ... "
182 putStr "Generating HTML ... "
183 runtime <- getRuntime flags
183 runtime <- getRuntime flags
184− let html = genHtml $ createHtml runtime (takeBaseName rootFile) (sources js) ""
184+ let html = genHtml $ createHtml runtime (takeBaseName rootFile) (sources js) moduleName ""
185 writeFile (file flags rootFile "html") html
185 writeFile (file flags rootFile "html") html
186 putStrLn "Done"
186 putStrLn "Done"
187
187
@@ -197,10 +197,10 @@ build flags rootFile = do
197 [ Source (if minify flags then Minified else Readable) js ]
197 [ Source (if minify flags then Minified else Readable) js ]
198
198
199
199
200−buildFiles :: Flags -> Int -> Interfaces -> [FilePath] -> IO Interfaces
200+buildFiles :: Flags -> Int -> Interfaces -> String -> [FilePath] -> IO (String, Interfaces)
201−buildFiles _ _ interfaces [] = return interfaces
201+buildFiles _ _ interfaces moduleName [] = return (moduleName, interfaces)
202−buildFiles flags numModules interfaces (filePath:rest) = do
202+buildFiles flags numModules interfaces _ (filePath:rest) = do
203 interface <- buildFile flags (numModules - length rest) numModules interfaces filePath
203 interface <- buildFile flags (numModules - length rest) numModules interfaces filePath
204 let moduleName = List.intercalate "." . splitDirectories $ dropExtensions filePath
204 let moduleName = List.intercalate "." . splitDirectories $ dropExtensions filePath
205 interfaces' = Map.insert moduleName interface interfaces
205 interfaces' = Map.insert moduleName interface interfaces
206− buildFiles flags numModules interfaces' rest
206+ buildFiles flags numModules interfaces' moduleName rest
compiler/Generate/Html.hs+5−21
@@ -40,27 +40,10 @@ generateHtml :: String -- ^ Location of elm-runtime.js as expected by the browse
40 -> String -- ^ The page title
40 -> String -- ^ The page title
41 -> String -- ^ The elm source code.
41 -> String -- ^ The elm source code.
42 -> H.Html
42 -> H.Html
43−generateHtml libLoc title source = H.span "broken for now"
43+generateHtml libLoc title source = error "function 'generateHtml' is unimplemented for now"
44−{--
45− case buildFromSource True source of
46− Right modul -> createHtml libLoc title [] "" title [modul]
47− Left err -> createHtml Readable libLoc title (Right $ showErr err)
48− (H.noscript "") "Main"
49−--}
50−{--
51−modulesToHtml :: FilePath -> String -> []
52−modulesToHtml libLoc title scripts nscrpt modules =
53− createHtml jsStyle libLoc title' js noscript altTitle
54− where
55− js = Right $ jss ++ concatMap jsModule modules
56− noscript = if nscrpt then extractNoscript $ last modules else ""
57− title' = if null title then altTitle else title
58− altTitle = intercalate "." names
59− where Module names _ _ _ = last modules
60−--}
61
44
62−createHtml :: FilePath -> String -> [JSSource] -> String -> H.Html
45+createHtml :: FilePath -> String -> [JSSource] -> String -> String -> H.Html
63−createHtml libLoc title scripts noscript =
46+createHtml libLoc title scripts moduleName noscript =
64 H.docTypeHtml $ do
47 H.docTypeHtml $ do
65 H.head $ do
48 H.head $ do
66 H.meta ! A.charset "UTF-8"
49 H.meta ! A.charset "UTF-8"
@@ -68,5 +51,6 @@ createHtml libLoc title scripts noscript =
68 makeScript (Link libLoc)
51 makeScript (Link libLoc)
69 mapM_ makeScript scripts
52 mapM_ makeScript scripts
70 H.body $ do
53 H.body $ do
54+ H.script ! A.type_ "text/javascript" $
71− H.script ! A.type_ "text/javascript" $ preEscapedToMarkup ("Elm.fullscreen(Elm.Main)" :: String)
55+ preEscapedToMarkup ("Elm.fullscreen(Elm." ++ moduleName ++ ")")
72 H.noscript $ preEscapedToMarkup noscript
56 H.noscript $ preEscapedToMarkup noscript