Style change and make tests run on WIndows

johnwalley · Dec 15, 2016 · c671453 · c671453
1 parent daec16c
commit c671453
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3-bumps-chart",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Draw bumps charts.",
   "keywords": [
     "d3",
@@ -22,7 +22,7 @@
   },
   "scripts": {
     "pretest": "rm -rf build && mkdir build && rollup -c -f umd -g d3-array:d3,d3-dsv:d3,d3-selection:d3,d3-scale:d3,d3-shape:d3,d3-transition:d3,lodash:_ -n d3_bumps_chart -o build/d3-bumps-chart.js -- index.js",
-    "test": "tape 'test/**/*-test.js' && eslint index.js src",
+    "test": "tape test/**/*-test.js && eslint index.js src",
     "prepublish": "npm run test && uglifyjs --preamble \"$(preamble)\" build/d3-bumps-chart.js -c -m -o build/d3-bumps-chart.min.js",
     "postpublish": "zip -j build/d3-bumps-chart.zip -- LICENSE README.md build/d3-bumps-chart.js build/d3-bumps-chart.min.js"
   },

diff --git a/src/chart.js b/src/chart.js
@@ -253,8 +253,7 @@ export default function () {
       .attr('class', 'active')
       .classed('blades', d => d.blades)
       .classed('spoons', d => d.spoons)
-      .style('stroke-dasharray', d => d.blades ? '10,5' : null)
-      .style('stroke-dasharray', d => d.spoons ? '5,5' : null)
+      .style('stroke-dasharray', d => d.blades ? '10,5' : (d.spoons ? '5,5' : null))
       .style('cursor', 'pointer');
 
     crewYear.transition()