aboutsummaryrefslogtreecommitdiff
path: root/src/Main.elm
diff options
context:
space:
mode:
authorJoris Guyonvarch2015-05-10 13:06:08 +0200
committerJoris Guyonvarch2015-05-10 13:06:08 +0200
commit1f06679a739ba0be3b6b91c10bfd762a06c9573a (patch)
tree060353b47ddb4e2ad1f366015d70a0d712149c23 /src/Main.elm
parentcf26834c717043685866b47eb95bcd8d1299a78b (diff)
Migrationg to Elm 0.15
Diffstat (limited to 'src/Main.elm')
-rw-r--r--src/Main.elm22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Main.elm b/src/Main.elm
index b84a3ae..746df14 100644
--- a/src/Main.elm
+++ b/src/Main.elm
@@ -3,22 +3,22 @@ module Main
) where
import Signal
-import Html (Html)
-import Time (..)
+import Html exposing (Html)
+import Time exposing (..)
import Mouse
-import Json.Encode (Value)
+import Json.Encode exposing (Value)
import Keyboard
import Char
import Dict
import List
-import Keyboard (KeyCode)
+import Keyboard exposing (KeyCode)
-import Model.Model (..)
-import Model.Position (..)
-import Model.TimerState (..)
-import Model.Id (..)
-import Update.Update (..)
-import View.View (view)
+import Model.Model exposing (..)
+import Model.Position exposing (..)
+import Model.TimerState exposing (..)
+import Model.Id exposing (..)
+import Update.Update exposing (..)
+import View.View exposing (view)
main : Signal Html
main = Signal.map view model
@@ -29,7 +29,7 @@ model = Signal.foldp logUpdate (initialModel initialTime) input
input : Signal Action
input =
Signal.mergeMany
- [ Signal.subscribe updates
+ [ actions.signal
, Signal.map DeltaTime (fps 30)
, Signal.map KeyPressed keyPress
]