From 83543758b9682f0e476809f207957471fcbbff5b Mon Sep 17 00:00:00 2001 From: nsensfel Date: Wed, 15 Jan 2020 17:22:01 +0100 Subject: ... --- src/roster-editor/src/Comm/JoinBattle.elm | 8 ++++---- src/roster-editor/src/Comm/LoadRoster.elm | 8 ++++---- src/roster-editor/src/Comm/Send.elm | 8 ++++---- src/roster-editor/src/Comm/UpdateRoster.elm | 8 ++++---- src/roster-editor/src/View/CharacterIcon.elm | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/roster-editor') diff --git a/src/roster-editor/src/Comm/JoinBattle.elm b/src/roster-editor/src/Comm/JoinBattle.elm index 90978a9..90dc0c4 100644 --- a/src/roster-editor/src/Comm/JoinBattle.elm +++ b/src/roster-editor/src/Comm/JoinBattle.elm @@ -23,8 +23,8 @@ import Struct.Model -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- -try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value) -try_encoding model = +maybe_encode : Struct.Model.Type -> (Maybe Json.Encode.Value) +maybe_encode model = (Just (Json.Encode.object [ @@ -95,8 +95,8 @@ try_encoding model = -------------------------------------------------------------------------------- try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type)) try model = - (Comm.Send.try_sending + (Comm.Send.maybe_send model Constants.IO.join_battle_handler - try_encoding + maybe_encod ) diff --git a/src/roster-editor/src/Comm/LoadRoster.elm b/src/roster-editor/src/Comm/LoadRoster.elm index 062caf2..0327806 100644 --- a/src/roster-editor/src/Comm/LoadRoster.elm +++ b/src/roster-editor/src/Comm/LoadRoster.elm @@ -21,8 +21,8 @@ import Struct.Model -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- -try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value) -try_encoding model = +maybe_encode : Struct.Model.Type -> (Maybe Json.Encode.Value) +maybe_encode model = (Just (Json.Encode.object [ @@ -46,8 +46,8 @@ try_encoding model = -------------------------------------------------------------------------------- try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type)) try model = - (Comm.Send.try_sending + (Comm.Send.maybe_send model Constants.IO.roster_loading_handler - try_encoding + maybe_encod ) diff --git a/src/roster-editor/src/Comm/Send.elm b/src/roster-editor/src/Comm/Send.elm index f6e9847..f0d6387 100644 --- a/src/roster-editor/src/Comm/Send.elm +++ b/src/roster-editor/src/Comm/Send.elm @@ -1,4 +1,4 @@ -module Comm.Send exposing (try_sending, empty_request) +module Comm.Send exposing (maybe_send, empty_request) -- Elm ------------------------------------------------------------------------- import Http @@ -60,14 +60,14 @@ decode = -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- -------------------------------------------------------------------------------- -try_sending : ( +maybe_send : ( Struct.Model.Type -> String -> (Struct.Model.Type -> (Maybe Json.Encode.Value)) -> (Maybe (Cmd Struct.Event.Type)) ) -try_sending model recipient try_encoding_fun = - case (try_encoding_fun model) of +maybe_send model recipient maybe_encod_fun = + case (maybe_encod_fun model) of (Just serial) -> (Just (Http.post diff --git a/src/roster-editor/src/Comm/UpdateRoster.elm b/src/roster-editor/src/Comm/UpdateRoster.elm index a635359..4e3ee54 100644 --- a/src/roster-editor/src/Comm/UpdateRoster.elm +++ b/src/roster-editor/src/Comm/UpdateRoster.elm @@ -26,8 +26,8 @@ import Struct.Model -------------------------------------------------------------------------------- -- LOCAL ----------------------------------------------------------------------- -------------------------------------------------------------------------------- -try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value) -try_encoding model = +maybe_encode : Struct.Model.Type -> (Maybe Json.Encode.Value) +maybe_encode model = (Just (Json.Encode.object [ @@ -63,8 +63,8 @@ try_encoding model = -------------------------------------------------------------------------------- try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type)) try model = - (Comm.Send.try_sending + (Comm.Send.maybe_send model Constants.IO.roster_update_handler - try_encoding + maybe_encod ) diff --git a/src/roster-editor/src/View/CharacterIcon.elm b/src/roster-editor/src/View/CharacterIcon.elm index bd91d83..52b569c 100644 --- a/src/roster-editor/src/View/CharacterIcon.elm +++ b/src/roster-editor/src/View/CharacterIcon.elm @@ -115,7 +115,7 @@ get_focus_class model char = else if ( - (Struct.CharacterTurn.try_getting_target model.char_turn) + (Struct.CharacterTurn.maybe_get_target model.char_turn) == (Just (Struct.Character.get_index char)) ) -- cgit v1.2.3-70-g09d2