Merge branch 'release/v2.0.6'

VizArtJS · Dec 8, 2018 · 27d8b73 · 27d8b73
2 parents 4443198 + 212734d
commit 27d8b73
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/demo/scatter.html b/demo/scatter.html
@@ -159,16 +159,36 @@
         });
 
         $('#a1').click(function(){
-            scatter.sort('exp_dat', 'asc');
+            options2.ordering = {
+                accessor: 'exp_dat',
+                direction: 'asc'
+            }
+            scatter.options(options2);
+            scatter.update();
         })
         $('#a2').click(function(){
-            scatter.sort('exp_dat', 'desc');
+            options2.ordering = {
+                accessor: 'exp_dat',
+                direction: 'desc'
+            }
+            scatter.options(options2);
+            scatter.update();
         });
         $('#a3').click(function(){
-            scatter.sort('exp_amo', 'asc');
+            options2.ordering = {
+                accessor: 'exp_amo',
+                direction: 'asc'
+            }
+            scatter.options(options2);
+            scatter.update();
         });
         $('#a4').click(function(){
-            scatter.sort('exp_amo', 'desc');
+            options2.ordering = {
+                accessor: 'exp_amo',
+                direction: 'desc'
+            }
+            scatter.options(options2);
+            scatter.update();
         });
 
     });

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "vizart-basic",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "VizArt Basic Charts: bar, row, rose, line, area, etc.",
   "main": "dist/vizart-basic.js",
-  "module": "dist/vizart-basic.mjs",
-  "jsnext:main": "dist/vizart-basic.mjs",
+  "module": "dist/vizart-basic.esm.js",
+  "jsnext:main": "dist/vizart-basic.esm.js",
   "style": "dist/vizart-basic.css",
   "scripts": {
     "_prebuild": "eslint src test",
@@ -42,7 +42,7 @@
     "d3-timer": "^1.0.9",
     "d3-transition": "^1.1.3",
     "d3-voronoi": "^1.1.4",
-    "vizart-core": "^2.0.2"
+    "vizart-core": "^2.0.3"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",

diff --git a/src/helper/builder.js b/src/helper/builder.js
@@ -44,6 +44,7 @@ const build = builderConfig => (ChartOpt, animate, apis = []) => (id, opt) => {
   const baseChart = canvasLayer(id, opt, compose(ChartOpt));
 
   const chart = Object.assign(
+    {},
     baseChart,
     apiRender(baseChart, animate, hasAxis, stacked),
     apiUpdateChart(baseChart, animate, hasAxis, stacked)