summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-01-16 23:02:31 +0100
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-01-16 23:02:31 +0100
commitda7d8fa1eecae1a9c1ffd49e87e7cd14a7362fd5 (patch)
treebd484c7369359d22b66a395a5ae998dabac8adb0 /src/battle
parent17b3c3ab34035c57b8594d7f674c5d9ac0a843fb (diff)
...
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/Makefile2
-rw-r--r--src/battle/elm-package.json20
-rwxr-xr-x[-rw-r--r--]src/battle/src/Action/Scroll.elm14
3 files changed, 8 insertions, 28 deletions
diff --git a/src/battle/Makefile b/src/battle/Makefile
index 3b58a08..4fabb97 100644
--- a/src/battle/Makefile
+++ b/src/battle/Makefile
@@ -5,7 +5,7 @@ SRC_DIR ?= src
WWW_DIR ?= www
WWW_SCRIPT_DIR ?= $(WWW_DIR)/script
-ELM_CC ?= elm-make --warn
+ELM_CC ?= elm make
MAIN_MODULE ?= $(SRC_DIR)/Main.elm
diff --git a/src/battle/elm-package.json b/src/battle/elm-package.json
deleted file mode 100644
index e824a29..0000000
--- a/src/battle/elm-package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "version": "1.0.0",
- "summary": "helpful summary of your project, less than 80 characters",
- "repository": "https://github.com/nsensfel/tacticians-client.git",
- "license": "Apache 2.0",
- "source-directories": [
- "src",
- "../shared/elm"
- ],
- "exposed-modules": [],
- "dependencies": {
- "NoRedInk/elm-decode-pipeline": "3.0.0 <= v < 4.0.0",
- "andrewMacmurray/elm-delay": "2.0.3 <= v < 3.0.0",
- "elm-lang/core": "5.1.1 <= v < 6.0.0",
- "elm-lang/dom": "1.1.1 <= v < 2.0.0",
- "elm-lang/html": "2.0.0 <= v < 3.0.0",
- "elm-lang/http": "1.0.0 <= v < 2.0.0"
- },
- "elm-version": "0.18.0 <= v < 0.19.0"
-}
diff --git a/src/battle/src/Action/Scroll.elm b/src/battle/src/Action/Scroll.elm
index cf071ae..fd9e80a 100644..100755
--- a/src/battle/src/Action/Scroll.elm
+++ b/src/battle/src/Action/Scroll.elm
@@ -1,8 +1,8 @@
module Action.Scroll exposing (to)
-- Elm -------------------------------------------------------------------------
-import Dom
-import Dom.Scroll
+import Browser.Dom
+import Browser.Dom.Scroll
import Task
@@ -25,9 +25,9 @@ tile_to_px ui t =
* (toFloat Constants.UI.tile_size)
)
-scroll_to_x : Int -> Struct.UI.Type -> (Task.Task Dom.Error ())
+scroll_to_x : Int -> Struct.UI.Type -> (Task.Task Browser.Dom.Error ())
scroll_to_x x ui =
- (Dom.Scroll.toX
+ (Browser.Dom.Scroll.toX
Constants.UI.viewer_html_id
(
(tile_to_px ui x)
@@ -37,9 +37,9 @@ scroll_to_x x ui =
)
)
-scroll_to_y : Int -> Struct.UI.Type -> (Task.Task Dom.Error ())
+scroll_to_y : Int -> Struct.UI.Type -> (Task.Task Browser.Dom.Error ())
scroll_to_y y ui =
- (Dom.Scroll.toY
+ (Browser.Dom.Scroll.toY
Constants.UI.viewer_html_id
(
(tile_to_px ui y)
@@ -52,7 +52,7 @@ scroll_to_y y ui =
--------------------------------------------------------------------------------
-- EXPORTED --------------------------------------------------------------------
--------------------------------------------------------------------------------
-to : Struct.Location.Type -> Struct.UI.Type -> (Task.Task Dom.Error (List ()))
+to : Struct.Location.Type -> Struct.UI.Type -> (Task.Task Browser.Dom.Error (List ()))
to loc ui =
(Task.sequence
[