update hover constant require statements

plotly · etpinard · May 10, 2017 · Apr 11, 2017 · Apr 11, 2017 · Apr 11, 2017
commit e6099558fbaaceea7b86de8bd41a40ecdae55b11
diff --git a/src/components/annotations/annotation_defaults.js b/src/components/annotations/annotation_defaults.js
@@ -11,8 +11,8 @@
 
 var Lib = require('../../lib');
 var Color = require('../color');
+var Fx = require('../fx');
 var Axes = require('../../plots/cartesian/axes');
-var constants = require('../../plots/cartesian/constants');
 
 var attributes = require('./attributes');
 
@@ -118,8 +118,8 @@ module.exports = function handleAnnotationDefaults(annIn, annOut, fullLayout, op
             Color.opacity(bgColor) ? Color.rgb(bgColor) : Color.defaultLine);
         var hoverBorder = coerce('hoverlabel.bordercolor', Color.contrast(hoverBG));
         Lib.coerceFont(coerce, 'hoverlabel.font', {
-            family: constants.HOVERFONT,
-            size: constants.HOVERFONTSIZE,
+            family: Fx.constants.HOVERFONT,
+            size: Fx.constants.HOVERFONTSIZE,
             color: hoverBorder
         });
     }

diff --git a/src/plots/attributes.js b/src/plots/attributes.js
@@ -8,7 +8,7 @@
 
 'use strict';
 
-var constants = require('./cartesian/constants');
+var constants = require('../components/fx/constants');
 var fontAttrs = require('./font_attributes');
 var extendFlat = require('../lib/extend').extendFlat;
 

diff --git a/src/traces/heatmap/hover.js b/src/traces/heatmap/hover.js
@@ -12,8 +12,7 @@
 var Fx = require('../../components/fx');
 var Lib = require('../../lib');
 
-var MAXDIST = require('../../plots/cartesian/constants').MAXDIST;
-
+var MAXDIST = Fx.constants.MAXDIST;
 
 module.exports = function hoverPoints(pointData, xval, yval,
8000
 hovermode, contour) {
     // never let a heatmap override another type as closest point

diff --git a/src/traces/scatter/hover.js b/src/traces/scatter/hover.js
@@ -11,11 +11,11 @@
 
 var Lib = require('../../lib');
 var Fx = require('../../components/fx');
-var constants = require('../../plots/cartesian/constants');
 var ErrorBars = require('../../components/errorbars');
 var getTraceColor = require('./get_trace_color');
 var Color = require('../../components/color');
 
+var MAXDIST = Fx.constants.MAXDIST;
 
 module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     var cd = pointData.cd,
@@ -148,7 +148,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
 
             Lib.extendFlat(pointData, {
                 // never let a 2D override 1D type as closest point
-                distance: constants.MAXDIST + 10,
+                distance: MAXDIST + 10,
                 x0: xmin,
                 x1: xmax,
                 y0: yAvg,

diff --git a/test/jasmine/tests/annotations_test.js b/test/jasmine/tests/annotations_test.js
@@ -5,7 +5,7 @@ var Plots = require('@src/plots/plots');
 var Lib = require('@src/lib');
 var Loggers = require('@src/lib/loggers');
 var Axes = require('@src/plots/cartesian/axes');
-var HOVERMINTIME = require('@src/plots/cartesian/constants').HOVERMINTIME;
+var HOVERMINTIME = require('@src/components/fx').constants.HOVERMINTIME;
 var DBLCLICKDELAY = require('@src/constants/interactions').DBLCLICKDELAY;
 
 var d3 = require('d3');

diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js
@@ -17,8 +17,7 @@ var mouseEvent = require('../assets/mouse_event');
 var click = require('../assets/click');
 
 var DBLCLICKDELAY = require('@src/constants/interactions').DBLCLICKDELAY;
-var HOVERMINTIME = require('@src/plots/cartesian/constants').HOVERMINTIME;
-
+var HOVERMINTIME = require('@src/components/fx').constants.HOVERMINTIME;
 
 function move(fromX, fromY, toX, toY, delay) {
     return new Promise(function(resolve) {

diff --git a/test/jasmine/tests/hover_label_test.js b/test/jasmine/tests/hover_label_test.js
@@ -2,8 +2,8 @@ var d3 = require('d3');
 
 var Plotly = require('@lib/index');
 var Fx = require('@src/components/fx');
-var constants = require('@src/plots/cartesian/constants');
 var Lib = require('@src/lib');
+var HOVERMINTIME = require('@src/components/fx').constants.HOVERMINTIME;
 
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
@@ -554,7 +554,7 @@ describe('hover info', function() {
             Promise.resolve().then(function() {
                 Fx.hover(gd, event, 'xy');
             })
-            .then(delay(constants.HOVERMINTIME * 1.1))
+            .then(delay(HOVERMINTIME * 1.1))
             .then(function() {
                 Fx.unhover(gd);
             })
@@ -719,7 +719,7 @@ describe('hover after resizing', function() {
 
             setTimeout(function() {
                 resolve();
-            }, constants.HOVERMINTIME);
+            }, HOVERMINTIME);
         });
     }
 
@@ -732,7 +732,7 @@ describe('hover after resizing', function() {
                 expect(hoverText.size()).toEqual(cnt, msg);
 
                 resolve();
-            }, constants.HOVERMINTIME);
+            }, HOVERMINTIME);
         });
     }
 
@@ -799,7 +799,7 @@ describe('hover on fill', function() {
                 expect(+transformCoords[1]).toBeCloseTo(labelPos[1], -1.2, labelText + ':y');
 
                 resolve();
-            }, constants.HOVERMINTIME);
+            }, HOVERMINTIME);
         });
     }
 
@@ -879,7 +879,7 @@ describe('hover updates', function() {
                 }
 
                 resolve();
-            }, constants.HOVERMINTIME);
+            }, HOVERMINTIME);
         });
     }
 
@@ -935,7 +935,7 @@ describe('hover updates', function() {
                 mouseEvent('mousemove', 394, 285);
                 setTimeout(function() {
                     resolve();
-                }, constants.HOVERMINTIME);
+                }, HOVERMINTIME);
             });
         }
 

diff --git a/test/jasmine/tests/scattermapbox_test.js b/test/jasmine/tests/scattermapbox_test.js
@@ -11,7 +11,7 @@ var customMatchers = require('../assets/custom_matchers');
 
 var mouseEvent = require('../assets/mouse_event');
 var click = require('../assets/click');
-var HOVERMINTIME = require('@src/plots/cartesian/constants').HOVERMINTIME;
+var HOVERMINTIME = require('@src/components/fx').constants.HOVERMINTIME;
 
 function move(fromX, fromY, toX, toY, delay) {
     return new Promise(function(resolve) {