Skip to content

Commit d735b83

Browse files
authored
fix(favicon): restore to original favicon when not on build page (#114)
* forgot commit to update model on favicon tick * revert filter change? * revert another change
1 parent c31a3a3 commit d735b83

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/elm/Main.elm

+12-7
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ update msg model =
613613
, repo = repo
614614
}
615615
, build = RemoteData.succeed build
616+
, favicon = statusToFavicon build.status
616617
}
617618
, Interop.setFavicon <| Encode.string <| statusToFavicon build.status
618619
)
@@ -904,7 +905,11 @@ update msg model =
904905
Tick interval time ->
905906
case interval of
906907
OneSecond ->
907-
( { model | time = time }, refreshFavicon model.page model.favicon model.build )
908+
let
909+
( favicon, cmd ) =
910+
refreshFavicon model.page model.favicon model.build
911+
in
912+
( { model | time = time, favicon = favicon }, cmd )
908913

909914
FiveSecond data ->
910915
( model, refreshPage model data )
@@ -1019,7 +1024,7 @@ refreshSubscriptions model =
10191024

10201025
{-| refreshFavicon : takes page and restores the favicon to the default when not viewing the build page
10211026
-}
1022-
refreshFavicon : Page -> Favicon -> WebData Build -> Cmd Msg
1027+
refreshFavicon : Page -> Favicon -> WebData Build -> ( Favicon, Cmd Msg )
10231028
refreshFavicon page currentFavicon build =
10241029
case page of
10251030
Pages.Build _ _ _ _ ->
@@ -1030,20 +1035,20 @@ refreshFavicon page currentFavicon build =
10301035
statusToFavicon b.status
10311036
in
10321037
if currentFavicon /= newFavicon then
1033-
Interop.setFavicon <| Encode.string newFavicon
1038+
( newFavicon, Interop.setFavicon <| Encode.string newFavicon )
10341039

10351040
else
1036-
Cmd.none
1041+
( currentFavicon, Cmd.none )
10371042

10381043
_ ->
1039-
Cmd.none
1044+
( currentFavicon, Cmd.none )
10401045

10411046
_ ->
10421047
if currentFavicon /= defaultFavicon then
1043-
Interop.setFavicon <| Encode.string defaultFavicon
1048+
( defaultFavicon, Interop.setFavicon <| Encode.string defaultFavicon )
10441049

10451050
else
1046-
Cmd.none
1051+
( currentFavicon, Cmd.none )
10471052

10481053

10491054
{-| refreshPage : refreshes Vela data based on current page and build status

0 commit comments

Comments
 (0)