exclude CDFs from new histogram event & label features

Author: alexcjohnson

src/traces/histogram/calc.js

@@ -171,15 +171,19 @@ module.exports = function calc(gd, trace) {
             var cdi = {
                 p: pos[i],
                 s: size[i],
-                b: 0,
-                pts: inputPoints[i]
+                b: 0
             };
-            if(uniqueValsPerBin) {
-                cdi.p0 = cdi.p1 = (inputPoints[i].length) ? pos0[inputPoints[i][0]] : pos[i];
-            }
-            else {
-                cdi.p0 = roundFn(binEdges[i]);
-                cdi.p1 = roundFn(binEdges[i + 1], true);
+
+            // pts and p0/p1 don't seem to make much sense for cumulative distributions
+            if(!cumulativeSpec.enabled) {
+                cdi.pts = inputPoints[i];
+                if(uniqueValsPerBin) {
+                    cdi.p0 = cdi.p1 = (inputPoints[i].length) ? pos0[inputPoints[i][0]] : pos[i];
+                }
+                else {
+                    cdi.p0 = roundFn(binEdges[i]);
+                    cdi.p1 = roundFn(binEdges[i + 1], true);
+                }
             }
             cd.push(cdi);
         }

src/traces/histogram/event_data.js

@@ -18,9 +18,12 @@ module.exports = function eventData(out, pt) {
     out.yaxis = pt.ya;
 
     // specific to histogram
-    out.pointNumbers = pt.pts;
-    out.binNumber = out.pointNumber;
-    delete out.pointNumber;
+    // CDFs do not have pts (yet?)
+    if(pt.pts) {
+        out.pointNumbers = pt.pts;
+        out.binNumber = out.pointNumber;
+        delete out.pointNumber;
+    }
 
     return out;
 };

src/traces/histogram/hover.js

@@ -18,12 +18,15 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
 
     pointData = pts[0];
     var di = pointData.cd[pointData.index];
+    var trace = pointData.cd[0].trace;
 
-    var posLetter = pointData.cd[0].trace.orientation === 'h' ? 'y' : 'x';
+    if(!trace.cumulative.enabled) {
+        var posLetter = trace.orientation === 'h' ? 'y' : 'x';
 
-    pointData[posLetter + 'LabelVal0'] = di.p0;
-    pointData[posLetter + 'LabelVal1'] = di.p1;
-    pointData.pts = di.pts;
+        pointData[posLetter + 'LabelVal0'] = di.p0;
+        pointData[posLetter + 'LabelVal1'] = di.p1;
+        pointData.pts = di.pts;
+    }
 
     return pts;
 };