Merge branch 'release/2.0.0-alpha'

VizArtJS · Mar 23, 2018 · 317a617 · 317a617
2 parents 9b492d4 + 3c543e5
commit 317a617
Show file tree

Hide file tree

Showing 65 changed files with 1,415 additions and 1,718 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,6 @@
 {
-  "presets": ["es2015"]
+  "presets": [
+    "es2015"
+  ],
+  "plugins": ["transform-object-rest-spread"]
 }
diff --git a/demo/color-rects.html b/demo/color-rects.html
@@ -35,9 +35,8 @@
             useFV: false,
             colorblind: false
         });
-        let _selector = new VizArtCore.HclSelector(VizArtCore.AllHcl);
         let subspaceSamples = VizArtCore.getSubColorSpace(palette, function (c) {
-            return _selector.validate(c.hcl);
+            return VizArtCore.hclSelector(VizArtCore.AllHcl, c.hcl);
         });
 
         let primes = _.keys(subspaceSamples);

diff --git a/demo/colorspace-select.html b/demo/colorspace-select.html
@@ -26,9 +26,8 @@
 <script>
     $(document).ready(function () {
 
-        let _selector = new VizArtCore.HclSelector(VizArtCore.IceCube);
-        let subspaceSamples = VizArtCore.selectColorSpace(function (c) {
-            return _selector.validate(c.hcl);
+        const subspaceSamples = VizArtCore.selectColorSpace(function (c) {
+            return VizArtCore.hclSelector(VizArtCore.IceCube, c.hcl);
         });
 
 

diff --git a/demo/keiko.html b/demo/keiko.html
@@ -48,7 +48,6 @@
 
 //        let palette = VizArtCore.reduceToPalette(10, VizArtCore.FancyLight);
 //        console.log(palette);
-        let _selector = new VizArtCore.HclSelector(VizArtCore.FancyLight);
 
         const _original20 = ['#528b6a'
             ,'#91c095'
@@ -83,7 +82,7 @@
 
 
         let subspaceSamples = VizArtCore.getSubColorSpace(palette, function (c) {
-            return _selector.validate(c.hcl);
+            return VizArtCore.hclSelector(VizArtCore.FancyLight, c.hcl);
         });
 
         let forceStopTimers = [];

diff --git a/demo/scientific-color.html b/demo/scientific-color.html
@@ -39,9 +39,8 @@
         }
 
         let palette = VizArtCore.reduceToPalette(10, VizArtCore.FancyLight);
-        let _selector = new VizArtCore.HclSelector(VizArtCore.FancyLight);
         let subspaceSamples = VizArtCore.getSubColorSpace(palette, function (c) {
-            return _selector.validate(c.hcl);
+            return VizArtCore.hclSelector(VizArtCore.FancyLight, c.hcl);
         });
 
         let forceStopTimers = [];

diff --git a/demo/stack-overflow.html b/demo/stack-overflow.html
@@ -274,9 +274,8 @@ <h2>Graph Filters</h2>
                 }
             });
 //            let palette = VizArtCore.reduceToPalette(totalColors, VizArtCore.Pimp);
-            let _selector = new VizArtCore.HclSelector(VizArtCore.Pimp);
             let subspaceSamples = VizArtCore.getSubColorSpace(palette, function (c) {
-                return _selector.validate(c.hcl);
+                return VizArtCore.hclSelector(VizArtCore.Pimp, c.hcl);
             });
 
             function mapColor(d) {

diff --git a/demo/twitter.html b/demo/twitter.html
@@ -25,19 +25,14 @@
 <div id="test"></div>
 <script>
     $(document).ready(function () {
-
-
         let palette = VizArtCore.reduceToPalette(20, VizArtCore.AllHcl, {
             colorblind: false
         });
-        let _selector = new VizArtCore.HclSelector(VizArtCore.AllHcl);
         let subspaceSamples = VizArtCore.getSubColorSpace(palette, function (c) {
-            return _selector.validate(c.hcl);
+            return VizArtCore.hclSelector(VizArtCore.AllHcl, c.hcl);
         });
 
 
-
-
         d3.json('assets/twitter_mutual2.json', (err, res)=>{
             console.log(res);
             // INIT SIGMA