Address 3/4 of @alexcjohnson's comments on notches

krassowski · krassowski · commit 144989c7e97a · 2018-01-29T16:31:55.000-01:00
diff --git a/src/traces/box/defaults.js b/src/traces/box/defaults.js
@@ -29,8 +29,8 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     coerce('whiskerwidth');
     coerce('boxmean');
 
-    coerce('notched');
-    coerce('notchwidth');
+    var notched = coerce('notched');
+    if(notched) coerce('notchwidth');
 
     handlePointsDefaults(traceIn, traceOut, coerce, {prefix: 'box'});
 }
diff --git a/src/traces/box/plot.js b/src/traces/box/plot.js
@@ -146,10 +146,10 @@ function plotBoxAndWhiskers(sel, axes, trace, t) {
                 d3.select(this).attr('d',
                     'M' + m + ',' + posm0 + 'V' + posm1 + // median line
                     'M' + q1 + ',' + pos0 + 'V' + pos1 + // left edge
-                    (((notched === true)) ? 'H' + ln + 'L' + m + ',' + posm1 + 'L' + un + ',' + pos1 : '') + // top notched edge
+                    (notched ? 'H' + ln + 'L' + m + ',' + posm1 + 'L' + un + ',' + pos1 : '') + // top notched edge
                     'H' + q3 + // end of the top edge
                     'V' + pos0 + // right edge
-                    (((notched === true)) ? 'H' + un + 'L' + m + ',' + posm0 + 'L' + ln + ',' + pos0 : '') + // bottom notched edge
+                    (notched ? 'H' + un + 'L' + m + ',' + posm0 + 'L' + ln + ',' + pos0 : '') + // bottom notched edge
                     'Z' + // end of the box
                     'M' + q1 + ',' + posc + 'H' + lf + 'M' + q3 + ',' + posc + 'H' + uf + // whiskers
                     ((whiskerWidth === 0) ? '' : // whisker caps
@@ -158,10 +158,10 @@ function plotBoxAndWhiskers(sel, axes, trace, t) {
                 d3.select(this).attr('d',
                     'M' + posm0 + ',' + m + 'H' + posm1 + // median line
                     'M' + pos0 + ',' + q1 + 'H' + pos1 + // top of the box
-                    (((notched === true)) ? 'V' + ln + 'L' + posm1 + ',' + m + 'L' + pos1 + ',' + un : '') + // notched right edge
+                    (notched ? 'V' + ln + 'L' + posm1 + ',' + m + 'L' + pos1 + ',' + un : '') + // notched right edge
                     'V' + q3 + // end of the right edge
                     'H' + pos0 + // bottom of the box
-                    (((notched === true)) ? 'V' + un + 'L' + posm0 + ',' + m + 'L' + pos0 + ',' + ln : '') + // notched left edge
+                    (notched ? 'V' + un + 'L' + posm0 + ',' + m + 'L' + pos0 + ',' + ln : '') + // notched left edge
                     'Z' + // end of the box
                     'M' + posc + ',' + q1 + 'V' + lf + 'M' + posc + ',' + q3 + 'V' + uf + // whiskers
                     ((whiskerWidth === 0) ? '' : // whisker caps
diff --git a/test/image/baselines/box_horz_notched.png b/test/image/baselines/box_horz_notched.png
diff --git a/test/image/mocks/box_horz_notched.json b/test/image/mocks/box_horz_notched.json
@@ -282,6 +282,9 @@
       },
       "height":598,
       "width":1080,
+      "margin":{
+         "l":110
+      },
       "autosize":true
    }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {`
`29`	`29`	`coerce('whiskerwidth');`
`30`	`30`	`coerce('boxmean');`
`31`	`31`
`32`		`- coerce('notched');`
`33`		`- coerce('notchwidth');`
	`32`	`+ var notched = coerce('notched');`
	`33`	`+ if(notched) coerce('notchwidth');`
`34`	`34`
`35`	`35`	`handlePointsDefaults(traceIn, traceOut, coerce, {prefix: 'box'});`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,6 +282,9 @@`
`282`	`282`	`},`
`283`	`283`	`"height":598,`
`284`	`284`	`"width":1080,`
	`285`	`+ "margin":{`
	`286`	`+ "l":110`
	`287`	`+ },`
`285`	`288`	`"autosize":true`
`286`	`289`	`}`
`287`	`290`	`}`