Skip to content

Commit e008c0b

Browse files
committed
move selection code into components/selections
1 parent fefa11c commit e008c0b

File tree

17 files changed

+49
-46
lines changed

17 files changed

+49
-46
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
module.exports = {
4+
// max pixels off straight before a lasso select line counts as bent
5+
BENDPX: 1.5,
6+
7+
// smallest dimension allowed for a select box
8+
MINSELECT: 12,
9+
10+
// throttling limit (ms) for selectPoints calls
11+
SELECTDELAY: 100,
12+
13+
// cache ID suffix for throttle
14+
SELECTID: '-select',
15+
};
File renamed without changes.

src/plots/cartesian/select.js renamed to src/components/selections/select.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
var polybool = require('polybooljs');
44

55
var Registry = require('../../registry');
6-
var dashStyle = require('../../components/drawing').dashStyle;
7-
var Color = require('../../components/color');
8-
var Fx = require('../../components/fx');
9-
var makeEventData = require('../../components/fx/helpers').makeEventData;
10-
var dragHelpers = require('../../components/dragelement/helpers');
6+
var dashStyle = require('../drawing').dashStyle;
7+
var Color = require('../color');
8+
var Fx = require('../fx');
9+
var makeEventData = require('../fx/helpers').makeEventData;
10+
var dragHelpers = require('../dragelement/helpers');
1111
var freeMode = dragHelpers.freeMode;
1212
var rectMode = dragHelpers.rectMode;
1313
var drawMode = dragHelpers.drawMode;
1414
var openMode = dragHelpers.openMode;
1515
var selectMode = dragHelpers.selectMode;
1616

17-
var displayOutlines = require('../../components/shapes/draw_newshape/display_outlines');
18-
var handleEllipse = require('../../components/shapes/draw_newshape/helpers').handleEllipse;
19-
var newShapes = require('../../components/shapes/draw_newshape/newshapes');
17+
var displayOutlines = require('../shapes/draw_newshape/display_outlines');
18+
var handleEllipse = require('../shapes/draw_newshape/helpers').handleEllipse;
19+
var newShapes = require('../shapes/draw_newshape/newshapes');
2020

2121
var Lib = require('../../lib');
2222
var polygon = require('../../lib/polygon');
2323
var throttle = require('../../lib/throttle');
24-
var getFromId = require('./axis_ids').getFromId;
24+
var getFromId = require('../../plots/cartesian/axis_ids').getFromId;
2525
var clearGlCanvases = require('../../lib/clear_gl_canvases');
2626

2727
var redrawReglTraces = require('../../plot_api/subroutines').redrawReglTraces;

src/components/shapes/draw.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var Axes = require('../../plots/cartesian/axes');
77
var readPaths = require('./draw_newshape/helpers').readPaths;
88
var displayOutlines = require('./draw_newshape/display_outlines');
99

10-
var clearOutlineControllers = require('../../plots/cartesian/handle_outline').clearOutlineControllers;
10+
var clearOutlineControllers = require('../selections/handle_outline').clearOutlineControllers;
1111

1212
var Color = require('../color');
1313
var Drawing = require('../drawing');

src/components/shapes/draw_newshape/display_outlines.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var i090 = constants.i090;
1212
var i180 = constants.i180;
1313
var i270 = constants.i270;
1414

15-
var handleOutline = require('../../../plots/cartesian/handle_outline');
15+
var handleOutline = require('../../selections/handle_outline');
1616
var clearOutlineControllers = handleOutline.clearOutlineControllers;
1717

1818
var helpers = require('./helpers');

src/components/shapes/draw_newshape/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var constants = require('./constants');
66
var CIRCLE_SIDES = constants.CIRCLE_SIDES;
77
var SQRT2 = constants.SQRT2;
88

9-
var cartesianHelpers = require('../../../plots/cartesian/helpers');
9+
var cartesianHelpers = require('../../selections/helpers');
1010
var p2r = cartesianHelpers.p2r;
1111
var r2p = cartesianHelpers.r2p;
1212

src/components/shapes/draw_newshape/newshapes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ var i270 = constants.i270;
1212
var cos45 = constants.cos45;
1313
var sin45 = constants.sin45;
1414

15-
var cartesianHelpers = require('../../../plots/cartesian/helpers');
15+
var cartesianHelpers = require('../../selections/helpers');
1616
var p2r = cartesianHelpers.p2r;
1717
var r2p = cartesianHelpers.r2p;
1818

19-
var handleOutline = require('../../../plots/cartesian/handle_outline');
19+
var handleOutline = require('../../selections/handle_outline');
2020
var clearSelect = handleOutline.clearSelect;
2121

2222
var helpers = require('./helpers');

src/plot_api/plot_api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Drawing = require('../components/drawing');
1919
var Color = require('../components/color');
2020
var initInteractions = require('../plots/cartesian/graph_interact').initInteractions;
2121
var xmlnsNamespaces = require('../constants/xmlns_namespaces');
22-
var clearSelect = require('../plots/cartesian/select').clearSelect;
22+
var clearSelect = require('../components/selections/select').clearSelect;
2323

2424
var dfltConfig = require('./plot_config').dfltConfig;
2525
var manageArrays = require('./manage_arrays');

src/plots/cartesian/constants.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,15 @@ module.exports = {
2929
// pixels to move mouse before you stop clamping to starting point
3030
MINDRAG: 8,
3131

32-
// smallest dimension allowed for a select box
33-
MINSELECT: 12,
34-
3532
// smallest dimension allowed for a zoombox
3633
MINZOOM: 20,
3734

3835
// width of axis drag regions
3936
DRAGGERSIZE: 20,
4037

41-
// max pixels off straight before a lasso select line counts as bent
42-
BENDPX: 1.5,
43-
4438
// delay before a redraw (relayout) after smooth panning and zooming
4539
REDRAWDELAY: 50,
4640

47-
// throttling limit (ms) for selectPoints calls
48-
SELECTDELAY: 100,
49-
50-
// cache ID suffix for throttle
51-
SELECTID: '-select',
52-
5341
// last resort axis ranges for x and y axes if we have no data
5442
DFLTRANGEX: [-1, 6],
5543
DFLTRANGEY: [-1, 4],

src/plots/cartesian/dragbox.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ var redrawReglTraces = require('../../plot_api/subroutines').redrawReglTraces;
2626
var Plots = require('../plots');
2727

2828
var getFromId = require('./axis_ids').getFromId;
29-
var prepSelect = require('./select').prepSelect;
30-
var clearSelect = require('./select').clearSelect;
31-
var selectOnClick = require('./select').selectOnClick;
29+
var prepSelect = require('../../components/selections/select').prepSelect;
30+
var clearSelect = require('../../components/selections/select').clearSelect;
31+
var selectOnClick = require('../../components/selections/select').selectOnClick;
3232
var scaleZoom = require('./scale_zoom');
3333

3434
var constants = require('./constants');

src/plots/geo/geo.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ var Plots = require('../plots');
1818
var Axes = require('../cartesian/axes');
1919
var getAutoRange = require('../cartesian/autorange').getAutoRange;
2020
var dragElement = require('../../components/dragelement');
21-
var prepSelect = require('../cartesian/select').prepSelect;
22-
var clearSelect = require('../cartesian/select').clearSelect;
23-
var selectOnClick = require('../cartesian/select').selectOnClick;
21+
var prepSelect = require('../../components/selections/select').prepSelect;
22+
var clearSelect = require('../../components/selections/select').clearSelect;
23+
var selectOnClick = require('../../components/selections/select').selectOnClick;
2424

2525
var createGeoZoom = require('./zoom');
2626
var constants = require('./constants');

src/plots/mapbox/mapbox.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ var rectMode = dragHelpers.rectMode;
1414
var drawMode = dragHelpers.drawMode;
1515
var selectMode = dragHelpers.selectMode;
1616

17-
var prepSelect = require('../cartesian/select').prepSelect;
18-
var clearSelect = require('../cartesian/select').clearSelect;
19-
var clearSelectionsCache = require('../cartesian/select').clearSelectionsCache;
20-
var selectOnClick = require('../cartesian/select').selectOnClick;
17+
var prepSelect = require('../../components/selections/select').prepSelect;
18+
var clearSelect = require('../../components/selections/select').clearSelect;
19+
var clearSelectionsCache = require('../../components/selections/select').clearSelectionsCache;
20+
var selectOnClick = require('../../components/selections/select').selectOnClick;
2121

2222
var constants = require('./constants');
2323
var createMapboxLayer = require('./layers');

src/plots/plots.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var Color = require('../components/color');
1313
var BADNUM = require('../constants/numerical').BADNUM;
1414

1515
var axisIDs = require('./cartesian/axis_ids');
16-
var clearSelect = require('./cartesian/handle_outline').clearSelect;
16+
var clearSelect = require('../components/selections/handle_outline').clearSelect;
1717

1818
var animationAttrs = require('./animation_attributes');
1919
var frameAttrs = require('./frame_attributes');

src/plots/polar/polar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ var dragBox = require('../cartesian/dragbox');
1818
var dragElement = require('../../components/dragelement');
1919
var Fx = require('../../components/fx');
2020
var Titles = require('../../components/titles');
21-
var prepSelect = require('../cartesian/select').prepSelect;
22-
var selectOnClick = require('../cartesian/select').selectOnClick;
23-
var clearSelect = require('../cartesian/select').clearSelect;
21+
var prepSelect = require('../../components/selections/select').prepSelect;
22+
var selectOnClick = require('../../components/selections/select').selectOnClick;
23+
var clearSelect = require('../../components/selections/select').clearSelect;
2424
var setCursor = require('../../lib/setcursor');
2525
var clearGlCanvases = require('../../lib/clear_gl_canvases');
2626
var redrawReglTraces = require('../../plot_api/subroutines').redrawReglTraces;

src/plots/ternary/ternary.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ var dragHelpers = require('../../components/dragelement/helpers');
1919
var freeMode = dragHelpers.freeMode;
2020
var rectMode = dragHelpers.rectMode;
2121
var Titles = require('../../components/titles');
22-
var prepSelect = require('../cartesian/select').prepSelect;
23-
var selectOnClick = require('../cartesian/select').selectOnClick;
24-
var clearSelect = require('../cartesian/select').clearSelect;
25-
var clearSelectionsCache = require('../cartesian/select').clearSelectionsCache;
22+
var prepSelect = require('../../components/selections/select').prepSelect;
23+
var selectOnClick = require('../../components/selections/select').selectOnClick;
24+
var clearSelect = require('../../components/selections/select').clearSelect;
25+
var clearSelectionsCache = require('../../components/selections/select').clearSelectionsCache;
2626
var constants = require('../cartesian/constants');
2727

2828
function Ternary(options, fullLayout) {

src/traces/sankey/base_plot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var fxAttrs = require('../../components/fx/layout_attributes');
77

88
var setCursor = require('../../lib/setcursor');
99
var dragElement = require('../../components/dragelement');
10-
var prepSelect = require('../../plots/cartesian/select').prepSelect;
10+
var prepSelect = require('../../components/selections/select').prepSelect;
1111
var Lib = require('../../lib');
1212
var Registry = require('../../registry');
1313

0 commit comments

Comments
 (0)