revert hoverlabel in arraysToCalcdata -> add Fx.calc

Author: etpinard

src/components/fx/calc.js

@@ -0,0 +1,28 @@
+/**
+* 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 Lib = require('../../lib');
+
+module.exports = function calc(gd) {
+    var calcdata = gd.calcdata;
+
+    for(var i = 0; i < calcdata.length; i++) {
+        var cd = calcdata[i];
+        var trace = cd[0].trace;
+
+        if(trace.hoverlabel) {
+            Lib.mergeArray(trace.hoverlabel.bgcolor, cd, 'hbg');
+            Lib.mergeArray(trace.hoverlabel.bordercolor, cd, 'hbc');
+            Lib.mergeArray(trace.hoverlabel.font.size, cd, 'hts');
+            Lib.mergeArray(trace.hoverlabel.font.color, cd, 'htc');
+            Lib.mergeArray(trace.hoverlabel.font.family, cd, 'htf');
+        }
+    }
+};

src/components/fx/index.js

@@ -26,6 +26,8 @@ module.exports = {
     layoutAttributes: layoutAttributes,
     supplyLayoutDefaults: require('./layout_defaults'),
 
+    calc: require('./calc'),
+
     getDistanceFunction: helpers.getDistanceFunction,
     getClosest: helpers.getClosest,
     inbox: helpers.inbox,

src/plots/plots.js

@@ -2076,6 +2076,8 @@ plots.doCalcdata = function(gd, traces) {
         calcdata[i] = cd;
     }
 
+    Registry.getComponentMethod('fx', 'calc')(gd);
+
     // To handle the case of components using category names as coordinates, we
     // need to re-supply defaults for these objects now, after calc has
     // finished populating the category mappings

src/traces/bar/arrays_to_calcdata.js

@@ -28,12 +28,4 @@ module.exports = function arraysToCalcdata(cd, trace) {
             mergeArray(markerLine.width, cd, 'mlw');
         }
     }
-
-    if(trace.hoverlabel) {
-        mergeArray(trace.hoverlabel.bgcolor, cd, 'hbg');
-        mergeArray(trace.hoverlabel.bordercolor, cd, 'hbc');
-        mergeArray(trace.hoverlabel.font.size, cd, 'hts');
-        mergeArray(trace.hoverlabel.font.color, cd, 'htc');
-        mergeArray(trace.hoverlabel.font.family, cd, 'htf');
-    }
 };

src/traces/scatter/arrays_to_calcdata.js

@@ -17,10 +17,8 @@ module.exports = function arraysToCalcdata(cd, trace) {
 
     Lib.mergeArray(trace.text, cd, 'tx');
     Lib.mergeArray(trace.hovertext, cd, 'htx');
-
     Lib.mergeArray(trace.customdata, cd, 'data');
     Lib.mergeArray(trace.textposition, cd, 'tp');
-
     if(trace.textfont) {
         Lib.mergeArray(trace.textfont.size, cd, 'ts');
         Lib.mergeArray(trace.textfont.color, cd, 'tc');
@@ -40,12 +38,4 @@ module.exports = function arraysToCalcdata(cd, trace) {
             Lib.mergeArray(markerLine.width, cd, 'mlw');
         }
     }
-
-    if(trace.hoverlabel) {
-        Lib.mergeArray(trace.hoverlabel.bgcolor, cd, 'hbg');
-        Lib.mergeArray(trace.hoverlabel.bordercolor, cd, 'hbc');
-        Lib.mergeArray(trace.hoverlabel.font.size, cd, 'hts');
-        Lib.mergeArray(trace.hoverlabel.font.color, cd, 'htc');
-        Lib.mergeArray(trace.hoverlabel.font.family, cd, 'htf');
-    }
 };