pr comments addressed

Author: cryogenian

example/src/Bar.purs

@@ -10,13 +10,8 @@ import Control.Monad.Eff.Random (RANDOM, random)
 import DOM (DOM)
 import DOM.Node.Types (ElementId(..))
 import Data.Array as Arr
-import Data.Foreign (toForeign)
 import Data.Maybe (Maybe(..))
-import Data.Newtype (wrap)
-import Data.Symbol (SProxy(..))
 import Data.Traversable as F
-import Data.Tuple (Tuple(..))
-import Data.Variant as V
 import Debug.Trace as DT
 import ECharts.Chart as EC
 import ECharts.Commands as E

example/src/Pie.purs

@@ -4,10 +4,8 @@ import Prelude
 
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Exception (EXCEPTION)
-import Data.Foreign (toForeign)
 import Data.Maybe (Maybe(..))
 import Data.Symbol (SProxy(..))
-import Data.StrMap as SM
 import Data.Variant as V
 import Debug.Trace as DT
 import DOM (DOM)

example/src/Scatter.purs

@@ -5,17 +5,13 @@ import Prelude
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Exception (EXCEPTION)
 import Control.Monad.Eff.Random (RANDOM)
-
 import Data.Array (zipWith)
 import Data.Maybe (Maybe(..), maybe)
 import Data.NonEmpty as NE
 import Data.Tuple (Tuple(..), uncurry)
-
 import Debug.Trace as DT
-
 import DOM (DOM)
 import DOM.Node.Types (ElementId(..))
-
 import ECharts.Chart as EC
 import ECharts.Theme as ETheme
 import ECharts.Types as ET
@@ -24,7 +20,6 @@ import ECharts.Commands as E
 import ECharts.Monad (DSL)
 import Math (cos, sin, (%))
 import Utils as U
-import Unsafe.Coerce (unsafeCoerce)
 
 genSinData ∷ ∀ e. Eff (random ∷ RANDOM|e) (Array ET.Item)
 genSinData = do

src/ECharts/Chart.js

@@ -3,7 +3,7 @@ var echarts = require("echarts");
 exports.initImpl = function(theme) {
     return function(el) {
         return function() {
-            return echarts.init(el,theme);
+            return echarts.init(el, theme);
         };
     };
 };

src/ECharts/Event.js

@@ -83,41 +83,20 @@ exports.on_ = function(chart) {
         return function(callback) {
             return function() {
                 return chart.on(eName, function(e) {
-                    var modifiedE = eName === "brush" ? addAll(this.getOption(), e) : e;
-                    callback(modifiedE)();
+                    if (eName === "brush") {
+                        addAll(this.getOption(), e);
+                    }
+                    callback(e)();
                     });
             };
         };
     };
 };
 
-exports.dispatchAction_ = function(maybeKeys) {
-    return function(maybe) {
-        return function(rawAction) {
-            return function(chart) {
-                return function() {
-                    var keys = Object.keys(rawAction),
-                        i, key, value, keysArr,
-                        action = {};
-                    for (i = 0; i < keys.length; i++) {
-                        key = keys[i];
-                        if (typeof maybeKeys[rawAction.type] === "undefined") {
-                            keysArr = [];
-                        } else {
-                            keysArr = maybeKeys[rawAction.type];
-                        }
-                        if (keysArr.indexOf(key) == -1) {
-                            value = rawAction[key];
-                        } else {
-                            value = maybe(undefined)(function(x) {return x;})(rawAction[key]);
-                        }
-                        if (typeof value !== "undefined") {
-                            action[key] = value;
-                        }
-                    }
-                    chart.dispatchAction(action);
-                };
-            };
+exports.dispatchAction_ = function(action) {
+    return function(chart) {
+        return function() {
+            return chart.dispatchAction(action);
         };
     };
 }

src/ECharts/Event.purs

@@ -8,10 +8,8 @@ import Control.Monad.Except (runExcept)
 import Data.Foldable (for_)
 import Data.Foreign (Foreign, readString)
 import Data.Foreign.Index (readProp)
-import Data.Maybe as M
 import Data.List as L
 import Data.Record.Unsafe as R
-import Data.StrMap as SM
 import Data.Tuple (Tuple(..), fst, snd)
 import Data.Variant.Internal (RLProxy(..), variantTags, class VariantTags)
 import ECharts.Types (EChartsEvent, EChartsEventR, Chart, ECHARTS)
@@ -43,10 +41,8 @@ listenAll chart cb = liftEff $
   toEChartsEvent = unsafeCoerce
 
 foreign import dispatchAction_
-  ∷ ∀ e a b action
-  . SM.StrMap (Array String) -- mapping from action type to keys that are maybe's
-  → ( b → (a → b) → M.Maybe a → b ) -- maybe
-  → action
+  ∷ ∀ e action
+  . action
   → Chart
   → Eff ( echarts ∷ ECHARTS |e ) Unit
 
@@ -57,18 +53,8 @@ dispatch
   → Chart
   → m Unit
 dispatch vaction chart =
-  liftEff $ dispatchAction_ strmapConfig M.maybe action chart
+  liftEff $ dispatchAction_ action chart
   where
-  strmapConfig = SM.fromFoldable
-    [ Tuple "highlight" ["name", "dataIndex"]
-    , Tuple "downplay" ["name", "dataIndex"]
-    , Tuple "mapSelect" ["name", "dataIndex"]
-    , Tuple "mapUnSelect" ["name", "dataIndex"]
-    , Tuple "mapToggleSelect" ["name", "dataIndex"]
-    , Tuple "focusNodeAdjacency" ["seriesId", "seriesIndex", "seriesName"]
-    , Tuple "unfocusNodeAdjacency" ["seriesId", "seriesIndex", "seriesName"]
-    ]
-
   variantPair ∷ Tuple String {}
   variantPair = unsafeCoerce vaction