dillonkearns/elm-pages-v3-beta
1
1
Fork 0
mirror of https://github.com/dillonkearns/elm-pages-v3-beta.git synced 2024-11-29 09:32:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove more unwrapping.

Browse Source
This commit is contained in:
Dillon Kearns 2019-08-05 15:54:02 -07:00
parent 7a91738578
commit 27ecad8a1b
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
elm-package/src/Pages.elm
View File

@ -117,7 +117,7 @@ init :
-> Flags userFlags
-> Url
-> Browser.Navigation.Key
-> ( Model userModel userMsg metadata view, Cmd (Msg userMsg) )
-> ( ModelDetails userModel userMsg metadata view, Cmd (Msg userMsg) )
init markdownToHtml frontmatterParser toJsPort head parser content initUserModel flags url key =
let
( userModel, userCmd ) =
@ -154,12 +154,11 @@ init markdownToHtml frontmatterParser toJsPort head parser content initUserModel
in
case metadata of
Ok okMetadata ->
( Model
{ key = key
, url = url
, imageAssets = imageAssets
, userModel = userModel
, parsedContent =
( { key = key
, url = url
, imageAssets = imageAssets
, userModel = userModel
, parsedContent =
metadata
|> Result.andThen
(\m ->
@ -169,7 +168,7 @@ init markdownToHtml frontmatterParser toJsPort head parser content initUserModel
|> Result.Extra.combine
|> Result.map List.concat
)
}
}
, Cmd.batch
([ Content.lookup okMetadata url
|> Maybe.map head
@ -182,18 +181,17 @@ init markdownToHtml frontmatterParser toJsPort head parser content initUserModel
)
Err _ ->
( Model
{ key = key
, url = url
, imageAssets = imageAssets
, userModel = userModel
, parsedContent =
( { key = key
, url = url
, imageAssets = imageAssets
, userModel = userModel
, parsedContent =
metadata
|> Result.andThen
(\m ->
Content.buildAllData m parser imageAssets content.markup
)
}
}
, Cmd.batch
[ userCmd |> Cmd.map UserMsg
]
@ -270,7 +268,10 @@ application :
-> Program userFlags userModel userMsg metadata view
application config =
Browser.application
{ init = init config.markdownToHtml config.frontmatterParser config.toJsPort config.head config.parser config.content config.init
{ init =
\flags url key ->
init config.markdownToHtml config.frontmatterParser config.toJsPort config.head config.parser config.content config.init flags url key
|> Tuple.mapFirst Model
, view = view config.content config.parser config.view
, update = \msg (Model model) -> update config.update msg model |> Tuple.mapFirst Model
, subscriptions =