From 8df2bc690b8af7590a8468afbc3b86f95f0d356f Mon Sep 17 00:00:00 2001 From: Rick Richardson Date: Tue, 16 Sep 2014 16:59:43 -0400 Subject: [PATCH 1/2] 1 line change to enable D3/Event.elm to compile --- src/D3.elm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/D3.elm b/src/D3.elm index caed69c..06c48c5 100644 --- a/src/D3.elm +++ b/src/D3.elm @@ -27,6 +27,7 @@ module D3 , transition -- : Selection a , delay -- : (a -> Int -> Int) -> Selection a , duration -- : (a -> Int -> Int) -> Selection a + , Selection ) where import Json(..) From a25436decbe504b2bcdb3282e5b06cf3ff5b33d8 Mon Sep 17 00:00:00 2001 From: Rick Richardson Date: Sat, 4 Oct 2014 14:29:25 -0400 Subject: [PATCH 2/2] more changes for updates to 0.13, module import/export and operators --- examples/Circles.elm | 2 +- examples/Voronoi.elm | 2 +- src/D3.elm | 6 ++++++ src/D3/Event.elm | 1 + src/D3/Voronoi.elm | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/Circles.elm b/examples/Circles.elm index 87fa47b..024dbe8 100644 --- a/examples/Circles.elm +++ b/examples/Circles.elm @@ -25,7 +25,7 @@ svg ds ms = circles : Widget (number, number) number circles = selectAll "circle" - |= (\(x, y) -> repeat (x `div` 50) y) + |= (\(x, y) -> repeat (x // 50) y) |- enter <.> append "circle" |. fun attr "fill" color |. num attr "r" 0 diff --git a/examples/Voronoi.elm b/examples/Voronoi.elm index e470a42..5b7639c 100644 --- a/examples/Voronoi.elm +++ b/examples/Voronoi.elm @@ -72,7 +72,7 @@ voronoi = |- enter <.> append "path" |- update |. fun attr "d" (\ps _ -> path ps) - |. fun attr "class" (\_ i -> "q" ++ (show (mod i 9)) ++ "-9") + |. fun attr "class" (\_ i -> "q" ++ (show ((%) i 9)) ++ "-9") cells : [D3.Voronoi.Point] -> [[D3.Voronoi.Point]] cells = D3.Voronoi.cellsWithClipping margin.right margin.top dims.width dims.height diff --git a/src/D3.elm b/src/D3.elm index 06c48c5..a8c85ea 100644 --- a/src/D3.elm +++ b/src/D3.elm @@ -28,6 +28,12 @@ module D3 , delay -- : (a -> Int -> Int) -> Selection a , duration -- : (a -> Int -> Int) -> Selection a , Selection + , Widget + , (|.) + , (<.>) + , (|^) + , (|-) + , (|=) ) where import Json(..) diff --git a/src/D3/Event.elm b/src/D3/Event.elm index 4ed70e4..2378559 100644 --- a/src/D3/Event.elm +++ b/src/D3/Event.elm @@ -20,6 +20,7 @@ module D3.Event , focus -- : BasicHandler e a , blur -- : BasicHandler e a + , Stream ) where import D3(..) diff --git a/src/D3/Voronoi.elm b/src/D3/Voronoi.elm index a03f91e..81f30c8 100644 --- a/src/D3/Voronoi.elm +++ b/src/D3/Voronoi.elm @@ -1,6 +1,7 @@ module D3.Voronoi ( cells , cellsWithClipping + , Point ) where import Native.D3.Voronoi