From be70c09863e2b40807996e449ba10e600a01108d Mon Sep 17 00:00:00 2001 From: Jonathan Sterling Date: Thu, 14 Jan 2016 12:23:34 -0800 Subject: [PATCH] [SD-941] update build deps, fix warnings --- package.json | 4 ++-- src/Halogen/ECharts.purs | 4 +--- test/src/Test/Main.purs | 3 +-- test/src/Test/Options.purs | 14 +++++++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 8e300a0..a3a92b8 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "homepage": "https://github.com/slamdata/purescript-halogen-echarts", "dependencies": { "gulp": "^3.9.0", - "gulp-purescript": "^0.7.0", - "purescript": "^0.7.5-rc.2", + "gulp-purescript": "^0.8.0", + "purescript": "^0.7.6", "webpack-stream": "^2.1.1" }, "devDependencies": { diff --git a/src/Halogen/ECharts.purs b/src/Halogen/ECharts.purs index d6236e3..0922968 100644 --- a/src/Halogen/ECharts.purs +++ b/src/Halogen/ECharts.purs @@ -10,16 +10,14 @@ import Prelude import Control.Bind ((=<<)) import Control.Monad (when) -import Control.Monad.Aff (Aff(), later, later') +import Control.Monad.Aff (Aff()) import Control.Monad.Eff (Eff()) import Control.Monad.Eff.Random (random, RANDOM()) import Control.Monad.Eff.Ref (Ref(), REF(), readRef, modifyRef, writeRef, newRef) import Control.Monad.Maybe.Trans -import Control.Monad.Trans import Control.Plus (empty) import Css.Geometry (width, height) import Css.Size (px) -import Css.Stylesheet (Css()) import DOM (DOM()) import DOM.HTML (window) import DOM.HTML.Types ( HTMLElement() diff --git a/test/src/Test/Main.purs b/test/src/Test/Main.purs index 397fc53..731e609 100644 --- a/test/src/Test/Main.purs +++ b/test/src/Test/Main.purs @@ -5,11 +5,10 @@ import Prelude import Control.Monad.Aff (Aff(), runAff) import Control.Monad.Aff.AVar (AVAR()) import Control.Monad.Eff (Eff()) -import Control.Monad.Eff.Console (log, CONSOLE()) +import Control.Monad.Eff.Console (CONSOLE()) import Control.Monad.Eff.Random (randomInt, RANDOM()) import Control.Monad.Eff.Exception (EXCEPTION(), throwException) import Data.Array ((!!), length, snoc, sort, reverse, head, filter) -import Data.Generic (Generic, gEq, gCompare) import Data.Functor.Coproduct (Coproduct()) import Data.Maybe (Maybe(..), maybe) import Halogen diff --git a/test/src/Test/Options.purs b/test/src/Test/Options.purs index 7441989..80a8fe0 100644 --- a/test/src/Test/Options.purs +++ b/test/src/Test/Options.purs @@ -2,22 +2,19 @@ module Test.Options (options) where import Prelude -import Control.Monad.Eff (Eff()) import Data.Maybe (Maybe(..)) import ECharts.Axis -import ECharts.Chart import ECharts.Common import ECharts.Coords -import ECharts.Formatter import ECharts.Item.Data import ECharts.Item.Value import ECharts.Legend import ECharts.Options import ECharts.Series -import ECharts.Style.Item import ECharts.Toolbox import ECharts.Tooltip +simpleData :: Number -> ItemData simpleData = Value <<< Simple lineOptions :: Option @@ -116,6 +113,7 @@ lineOptions = Option $ optionDefault { } +chordOptions :: Option chordOptions = Option $ optionDefault { series = Just $ Just <$> [ ChordSeries { @@ -145,13 +143,15 @@ chordOptions = Option $ optionDefault { } - +indicator :: String -> Number -> Indicator indicator text max = Indicator $ indicatorDefault{text = Just text, max = Just max} +datPair :: Array Number -> String -> ItemData datPair val name = Dat $ (dataDefault $ Many val) {name = Just name} +radarOptions :: Option radarOptions = Option $ optionDefault { polar = Just $ [Polar polarDefault { indicator = Just [ @@ -178,10 +178,12 @@ radarOptions = Option $ optionDefault { +hloc :: Number -> Number -> Number -> Number -> ItemData hloc o c l h = Value $ HLOC { h: h, l: l, o: o, c: c } +kOptions :: Option kOptions = Option $ optionDefault { xAxis = Just $ OneAxis $ Axis axisDefault { "type" = Just CategoryAxis, @@ -211,9 +213,11 @@ kOptions = Option $ optionDefault { +simpleDat :: Number -> String -> ItemData simpleDat val nam = Dat $ (dataDefault $ Simple val) {name = Just nam} +funnelOptions :: Option funnelOptions = Option $ optionDefault { series = Just $ Just <$> [ FunnelSeries {