Skip to content

Commit 23b812a

Browse files
archmojarchmoj
committed
clearSelect > clearOutline
1 parent ab9da47 commit 23b812a

File tree

12 files changed

+30
-30
lines changed

12 files changed

+30
-30
lines changed

‎src/components/selections/draw_newselection/newselections.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var dragHelpers = require('../../dragelement/helpers');
44
var selectMode = dragHelpers.selectMode;
55

66
var handleOutline = require('../../shapes/handle_outline');
7-
var clearSelect = handleOutline.clearSelect;
7+
var clearOutline = handleOutline.clearOutline;
88

99
var helpers = require('../../shapes/draw_newshape/helpers');
1010
var readPaths = helpers.readPaths;
@@ -79,7 +79,7 @@ module.exports = function newSelections(outlines, dragOptions) {
7979
cell = null;
8080
}
8181

82-
clearSelect(gd);
82+
clearOutline(gd);
8383

8484
var editHelpers = dragOptions.editHelpers;
8585
var modifyItem = (editHelpers || {}).modifyItem;

‎src/components/selections/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717

1818
reselect: select.reselect,
1919
prepSelect: select.prepSelect,
20-
clearSelect: select.clearSelect,
20+
clearOutline: select.clearOutline,
2121
clearSelectionsCache: select.clearSelectionsCache,
2222
selectOnClick: select.selectOnClick
2323
};

‎src/components/selections/select.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var MINSELECT = constants.MINSELECT;
4444
var filteredPolygon = polygon.filter;
4545
var polygonTester = polygon.tester;
4646

47-
var clearSelect = require('../shapes/handle_outline').clearSelect;
47+
var clearOutline = require('../shapes/handle_outline').clearOutline;
4848

4949
var helpers = require('./helpers');
5050
var p2r = helpers.p2r;
@@ -614,7 +614,7 @@ function coerceSelectionsCache(evt, gd, dragOptions) {
614614

615615
// clear selection outline when selecting a different subplot
616616
if(!selectingOnSameSubplot) {
617-
clearSelect(gd);
617+
clearOutline(gd);
618618
fullLayout._lastSelectedSubplot = plotinfo.id;
619619
}
620620
}
@@ -1429,7 +1429,7 @@ function getFillRangeItems(dragOptions) {
14291429
module.exports = {
14301430
reselect: reselect,
14311431
prepSelect: prepSelect,
1432-
clearSelect: clearSelect,
1432+
clearOutline: clearOutline,
14331433
clearSelectionsCache: clearSelectionsCache,
14341434
selectOnClick: selectOnClick
14351435
};

‎src/components/shapes/draw_newshape/newshapes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var p2r = cartesianHelpers.p2r;
1717
var r2p = cartesianHelpers.r2p;
1818

1919
var handleOutline = require('.././handle_outline');
20-
var clearSelect = handleOutline.clearSelect;
20+
var clearOutline = handleOutline.clearOutline;
2121

2222
var helpers = require('./helpers');
2323
var readPaths = helpers.readPaths;
@@ -190,7 +190,7 @@ module.exports = function newShapes(outlines, dragOptions) {
190190
cell = null;
191191
}
192192

193-
clearSelect(gd);
193+
clearOutline(gd);
194194

195195
var editHelpers = dragOptions.editHelpers;
196196
var modifyItem = (editHelpers || {}).modifyItem;

‎src/components/shapes/handle_outline.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function clearOutlineControllers(gd) {
77
}
88
}
99

10-
function clearSelect(gd) {
10+
function clearOutline(gd) {
1111
var zoomLayer = gd._fullLayout._zoomlayer;
1212
if(zoomLayer) {
1313
// until we get around to persistent selections, remove the outline
@@ -21,5 +21,5 @@ function clearSelect(gd) {
2121

2222
module.exports = {
2323
clearOutlineControllers: clearOutlineControllers,
24-
clearSelect: clearSelect
24+
clearOutline: clearOutline
2525
};

‎src/plot_api/plot_api.js

Lines changed: 2 additions & 2 deletions
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('../components/selections').clearSelect;
22+
var clearOutline = require('../components/selections').clearOutline;
2323

2424
var dfltConfig = require('./plot_config').dfltConfig;
2525
var manageArrays = require('./manage_arrays');
@@ -1899,7 +1899,7 @@ function addAxRangeSequence(seq, rangesAltered) {
18991899
};
19001900

19011901
seq.push(
1902-
clearSelect,
1902+
clearOutline,
19031903
subroutines.doAutoRangeAndConstraints,
19041904
drawAxes,
19051905
subroutines.drawData,

‎src/plots/cartesian/dragbox.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var Plots = require('../plots');
2727

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

@@ -239,7 +239,7 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
239239
// clear selection polygon cache (if any)
240240
dragOptions.plotinfo.selection = false;
241241
// clear selection outlines
242-
clearSelect(gd);
242+
clearOutline(gd);
243243
}
244244

245245
function clickFn(numClicks, evt) {

‎src/plots/geo/geo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Axes = require('../cartesian/axes');
1919
var getAutoRange = require('../cartesian/autorange').getAutoRange;
2020
var dragElement = require('../../components/dragelement');
2121
var prepSelect = require('../../components/selections').prepSelect;
22-
var clearSelect = require('../../components/selections').clearSelect;
22+
var clearOutline = require('../../components/selections').clearOutline;
2323
var selectOnClick = require('../../components/selections').selectOnClick;
2424

2525
var createGeoZoom = require('./zoom');
@@ -462,7 +462,7 @@ proto.updateFx = function(fullLayout, geoLayout) {
462462
subplot: _this.id,
463463
clickFn: function(numClicks) {
464464
if(numClicks === 2) {
465-
clearSelect(gd);
465+
clearOutline(gd);
466466
}
467467
}
468468
};

‎src/plots/mapbox/mapbox.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var drawMode = dragHelpers.drawMode;
1515
var selectMode = dragHelpers.selectMode;
1616

1717
var prepSelect = require('../../components/selections').prepSelect;
18-
var clearSelect = require('../../components/selections').clearSelect;
18+
var clearOutline = require('../../components/selections').clearOutline;
1919
var clearSelectionsCache = require('../../components/selections').clearSelectionsCache;
2020
var selectOnClick = require('../../components/selections').selectOnClick;
2121

@@ -506,9 +506,9 @@ proto.initFx = function(calcData, fullLayout) {
506506

507507
// define event handlers on map creation, to keep one ref per map,
508508
// so that map.on / map.off in updateFx works as expected
509-
self.clearSelect = function() {
509+
self.clearOutline = function() {
510510
clearSelectionsCache(self.dragOptions);
511-
clearSelect(self.dragOptions.gd);
511+
clearOutline(self.dragOptions.gd);
512512
};
513513

514514
/**

‎src/plots/plots.js

Lines changed: 2 additions & 2 deletions
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('../components/shapes/handle_outline').clearSelect;
16+
var clearOutline = require('../components/shapes/handle_outline').clearOutline;
1717

1818
var animationAttrs = require('./animation_attributes');
1919
var frameAttrs = require('./frame_attributes');
@@ -481,7 +481,7 @@ plots.supplyDefaults = function(gd, opts) {
481481
// we should try to come up with a better solution when implementing
482482
// https://github.com/plotly/plotly.js/issues/1851
483483
if(oldFullLayout._zoomlayer && !gd._dragging) {
484-
clearSelect({ // mock old gd
484+
clearOutline({ // mock old gd
485485
_fullLayout: oldFullLayout
486486
});
487487
}

‎src/plots/polar/polar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var Fx = require('../../components/fx');
2020
var Titles = require('../../components/titles');
2121
var prepSelect = require('../../components/selections').prepSelect;
2222
var selectOnClick = require('../../components/selections').selectOnClick;
23-
var clearSelect = require('../../components/selections').clearSelect;
23+
var clearOutline = require('../../components/selections').clearOutline;
2424
var setCursor = require('../../lib/setcursor');
2525
var clearGlCanvases = require('../../lib/clear_gl_canvases');
2626
var redrawReglTraces = require('../../plot_api/subroutines').redrawReglTraces;
@@ -922,7 +922,7 @@ proto.updateHoverAndMainDrag = function(fullLayout) {
922922
zb = dragBox.makeZoombox(zoomlayer, lum, cx, cy, path0);
923923
zb.attr('fill-rule', 'evenodd');
924924
corners = dragBox.makeCorners(zoomlayer, cx, cy);
925-
clearSelect(gd);
925+
clearOutline(gd);
926926
}
927927

928928
// N.B. this sets scoped 'r0' and 'r1'
@@ -1269,7 +1269,7 @@ proto.updateRadialDrag = function(fullLayout, polarLayout, rngIndex) {
12691269
dragOpts.moveFn = moveFn;
12701270
dragOpts.doneFn = doneFn;
12711271

1272-
clearSelect(gd);
1272+
clearOutline(gd);
12731273
};
12741274

12751275
dragOpts.clampFn = function(dx, dy) {
@@ -1434,7 +1434,7 @@ proto.updateAngularDrag = function(fullLayout) {
14341434
dragOpts.moveFn = moveFn;
14351435
dragOpts.doneFn = doneFn;
14361436

1437-
clearSelect(gd);
1437+
clearOutline(gd);
14381438
};
14391439

14401440
// I don't what we should do in this case, skip we now

‎src/plots/ternary/ternary.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var rectMode = dragHelpers.rectMode;
2121
var Titles = require('../../components/titles');
2222
var prepSelect = require('../../components/selections').prepSelect;
2323
var selectOnClick = require('../../components/selections').selectOnClick;
24-
var clearSelect = require('../../components/selections').clearSelect;
24+
var clearOutline = require('../../components/selections').clearOutline;
2525
var clearSelectionsCache = require('../../components/selections').clearSelectionsCache;
2626
var constants = require('../cartesian/constants');
2727

@@ -484,9 +484,9 @@ var STARTMARKER = 'm0.5,0.5h5v-2h-5v-5h-2v5h-5v2h5v5h2Z';
484484
// I guess this could be shared with cartesian... but for now it's separate.
485485
var SHOWZOOMOUTTIP = true;
486486

487-
proto.clearSelect = function() {
487+
proto.clearOutline = function() {
488488
clearSelectionsCache(this.dragOptions);
489-
clearSelect(this.dragOptions.gd);
489+
clearOutline(this.dragOptions.gd);
490490
};
491491

492492
proto.initInteractions = function() {
@@ -532,7 +532,7 @@ proto.initInteractions = function() {
532532
_this.dragOptions.clickFn = clickZoomPan;
533533
_this.dragOptions.doneFn = dragDone;
534534
panPrep();
535-
_this.clearSelect(gd);
535+
_this.clearOutline(gd);
536536
} else if(rectMode(dragModeNow) || freeMode(dragModeNow)) {
537537
prepSelect(e, startX, startY, _this.dragOptions, dragModeNow);
538538
}
@@ -610,7 +610,7 @@ proto.initInteractions = function() {
610610
})
611611
.attr('d', 'M0,0Z');
612612

613-
_this.clearSelect(gd);
613+
_this.clearOutline(gd);
614614
}
615615

616616
function getAFrac(x, y) { return 1 - (y / _this.h); }

0 commit comments

Comments
 (0)