refactor bar/hist hover

make histogram hover wrap bar hover, rather than being conditionals inside it

Author: alexcjohnson

src/traces/bar/hover.js

@@ -96,14 +96,6 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     pointData[posLetter + '0'] = pa.c2p(minPos(di), true);
     pointData[posLetter + '1'] = pa.c2p(maxPos(di), true);
     pointData[posLetter + 'LabelVal'] = di.p;
-    // for histograms
-    if(di.p0 !== undefined && di.p1 !== undefined) {
-        pointData[posLetter + 'LabelVal0'] = di.p0;
-        pointData[posLetter + 'LabelVal1'] = di.p1;
-    }
-
-    // for histograms
-    if(di.pts) pointData.pts = di.pts;
 
     fillHoverText(di, trace, pointData);
     ErrorBars.hoverInfo(di, trace, pointData);

src/traces/histogram/hover.js

@@ -0,0 +1,29 @@
+/**
+* Copyright 2012-2017, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var barHover = require('../bar/hover');
+
+module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
+    var pts = barHover(pointData, xval, yval, hovermode);
+
+    if(!pts) return;
+
+    pointData = pts[0];
+    var di = pointData.cd[pointData.index];
+
+    var posLetter = pointData.cd[0].trace.orientation === 'h' ? 'y' : 'x';
+
+    pointData[posLetter + 'LabelVal0'] = di.p0;
+    pointData[posLetter + 'LabelVal1'] = di.p1;
+    pointData.pts = di.pts;
+
+    return pts;
+};

src/traces/histogram/index.js

@@ -34,7 +34,7 @@ Histogram.setPositions = require('../bar/set_positions');
 Histogram.plot = require('../bar/plot');
 Histogram.style = require('../bar/style');
 Histogram.colorbar = require('../scatter/colorbar');
-Histogram.hoverPoints = require('../bar/hover');
+Histogram.hoverPoints = require('./hover');
 Histogram.selectPoints = require('../bar/select');
 Histogram.eventData = require('./event_data');