clearSelect > clearOutline

archmoj · archmoj · commit 23b812a0bbf0 · 2022-07-12T09:50:52.000-04:00
diff --git a/src/components/selections/draw_newselection/newselections.js b/src/components/selections/draw_newselection/newselections.js
@@ -4,7 +4,7 @@ var dragHelpers = require('../../dragelement/helpers');
 var selectMode = dragHelpers.selectMode;
 
 var handleOutline = require('../../shapes/handle_outline');
-var clearSelect = handleOutline.clearSelect;
+var clearOutline = handleOutline.clearOutline;
 
 var helpers = require('../../shapes/draw_newshape/helpers');
 var readPaths = helpers.readPaths;
@@ -79,7 +79,7 @@ module.exports = function newSelections(outlines, dragOptions) {
         cell = null;
     }
 
-    clearSelect(gd);
+    clearOutline(gd);
 
     var editHelpers = dragOptions.editHelpers;
     var modifyItem = (editHelpers || {}).modifyItem;
diff --git a/src/components/selections/index.js b/src/components/selections/index.js
@@ -17,7 +17,7 @@ module.exports = {
 
     reselect: select.reselect,
     prepSelect: select.prepSelect,
-    clearSelect: select.clearSelect,
+    clearOutline: select.clearOutline,
     clearSelectionsCache: select.clearSelectionsCache,
     selectOnClick: select.selectOnClick
 };
diff --git a/src/components/selections/select.js b/src/components/selections/select.js
@@ -44,7 +44,7 @@ var MINSELECT = constants.MINSELECT;
 var filteredPolygon = polygon.filter;
 var polygonTester = polygon.tester;
 
-var clearSelect = require('../shapes/handle_outline').clearSelect;
+var clearOutline = require('../shapes/handle_outline').clearOutline;
 
 var helpers = require('./helpers');
 var p2r = helpers.p2r;
@@ -614,7 +614,7 @@ function coerceSelectionsCache(evt, gd, dragOptions) {
 
     // clear selection outline when selecting a different subplot
     if(!selectingOnSameSubplot) {
-        clearSelect(gd);
+        clearOutline(gd);
         fullLayout._lastSelectedSubplot = plotinfo.id;
     }
 }
@@ -1429,7 +1429,7 @@ function getFillRangeItems(dragOptions) {
 module.exports = {
     reselect: reselect,
     prepSelect: prepSelect,
-    clearSelect: clearSelect,
+    clearOutline: clearOutline,
     clearSelectionsCache: clearSelectionsCache,
     selectOnClick: selectOnClick
 };
diff --git a/src/components/shapes/draw_newshape/newshapes.js b/src/components/shapes/draw_newshape/newshapes.js
@@ -17,7 +17,7 @@ var p2r = cartesianHelpers.p2r;
 var r2p = cartesianHelpers.r2p;
 
 var handleOutline = require('.././handle_outline');
-var clearSelect = handleOutline.clearSelect;
+var clearOutline = handleOutline.clearOutline;
 
 var helpers = require('./helpers');
 var readPaths = helpers.readPaths;
@@ -190,7 +190,7 @@ module.exports = function newShapes(outlines, dragOptions) {
         cell = null;
     }
 
-    clearSelect(gd);
+    clearOutline(gd);
 
     var editHelpers = dragOptions.editHelpers;
     var modifyItem = (editHelpers || {}).modifyItem;
diff --git a/src/components/shapes/handle_outline.js b/src/components/shapes/handle_outline.js
@@ -7,7 +7,7 @@ function clearOutlineControllers(gd) {
     }
 }
 
-function clearSelect(gd) {
+function clearOutline(gd) {
     var zoomLayer = gd._fullLayout._zoomlayer;
     if(zoomLayer) {
         // until we get around to persistent selections, remove the outline
@@ -21,5 +21,5 @@ function clearSelect(gd) {
 
 module.exports = {
     clearOutlineControllers: clearOutlineControllers,
-    clearSelect: clearSelect
+    clearOutline: clearOutline
 };
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -19,7 +19,7 @@ var Drawing = require('../components/drawing');
 var Color = require('../components/color');
 var initInteractions = require('../plots/cartesian/graph_interact').initInteractions;
 var xmlnsNamespaces = require('../constants/xmlns_namespaces');
-var clearSelect = require('../components/selections').clearSelect;
+var clearOutline = require('../components/selections').clearOutline;
 
 var dfltConfig = require('./plot_config').dfltConfig;
 var manageArrays = require('./manage_arrays');
@@ -1899,7 +1899,7 @@ function addAxRangeSequence(seq, rangesAltered) {
         };
 
     seq.push(
-        clearSelect,
+        clearOutline,
         subroutines.doAutoRangeAndConstraints,
         drawAxes,
         subroutines.drawData,
diff --git a/src/plots/cartesian/dragbox.js b/src/plots/cartesian/dragbox.js
@@ -27,7 +27,7 @@ var Plots = require('../plots');
 
 var getFromId = require('./axis_ids').getFromId;
 var prepSelect = require('../../components/selections').prepSelect;
-var clearSelect = require('../../components/selections').clearSelect;
+var clearOutline = require('../../components/selections').clearOutline;
 var selectOnClick = require('../../components/selections').selectOnClick;
 var scaleZoom = require('./scale_zoom');
 
@@ -239,7 +239,7 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
         // clear selection polygon cache (if any)
         dragOptions.plotinfo.selection = false;
         // clear selection outlines
-        clearSelect(gd);
+        clearOutline(gd);
     }
 
     function clickFn(numClicks, evt) {
diff --git a/src/plots/geo/geo.js b/src/plots/geo/geo.js
@@ -19,7 +19,7 @@ var Axes = require('../cartesian/axes');
 var getAutoRange = require('../cartesian/autorange').getAutoRange;
 var dragElement = require('../../components/dragelement');
 var prepSelect = require('../../components/selections').prepSelect;
-var clearSelect = require('../../components/selections').clearSelect;
+var clearOutline = require('../../components/selections').clearOutline;
 var selectOnClick = require('../../components/selections').selectOnClick;
 
 var createGeoZoom = require('./zoom');
@@ -462,7 +462,7 @@ proto.updateFx = function(fullLayout, geoLayout) {
         subplot: _this.id,
         clickFn: function(numClicks) {
             if(numClicks === 2) {
-                clearSelect(gd);
+                clearOutline(gd);
             }
         }
     };
diff --git a/src/plots/mapbox/mapbox.js b/src/plots/mapbox/mapbox.js
@@ -15,7 +15,7 @@ var drawMode = dragHelpers.drawMode;
 var selectMode = dragHelpers.selectMode;
 
 var prepSelect = require('../../components/selections').prepSelect;
-var clearSelect = require('../../components/selections').clearSelect;
+var clearOutline = require('../../components/selections').clearOutline;
 var clearSelectionsCache = require('../../components/selections').clearSelectionsCache;
 var selectOnClick = require('../../components/selections').selectOnClick;
 
@@ -506,9 +506,9 @@ proto.initFx = function(calcData, fullLayout) {
 
     // define event handlers on map creation, to keep one ref per map,
     // so that map.on / map.off in updateFx works as expected
-    self.clearSelect = function() {
+    self.clearOutline = function() {
         clearSelectionsCache(self.dragOptions);
-        clearSelect(self.dragOptions.gd);
+        clearOutline(self.dragOptions.gd);
     };
 
     /**
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -13,7 +13,7 @@ var Color = require('../components/color');
 var BADNUM = require('../constants/numerical').BADNUM;
 
 var axisIDs = require('./cartesian/axis_ids');
-var clearSelect = require('../components/shapes/handle_outline').clearSelect;
+var clearOutline = require('../components/shapes/handle_outline').clearOutline;
 
 var animationAttrs = require('./animation_attributes');
 var frameAttrs = require('./frame_attributes');
@@ -481,7 +481,7 @@ plots.supplyDefaults = function(gd, opts) {
     // we should try to come up with a better solution when implementing
     // https://github.com/plotly/plotly.js/issues/1851
     if(oldFullLayout._zoomlayer && !gd._dragging) {
-        clearSelect({ // mock old gd
+        clearOutline({ // mock old gd
             _fullLayout: oldFullLayout
         });
     }
diff --git a/src/plots/polar/polar.js b/src/plots/polar/polar.js
@@ -20,7 +20,7 @@ var Fx = require('../../components/fx');
 var Titles = require('../../components/titles');
 var prepSelect = require('../../components/selections').prepSelect;
 var selectOnClick = require('../../components/selections').selectOnClick;
-var clearSelect = require('../../components/selections').clearSelect;
+var clearOutline = require('../../components/selections').clearOutline;
 var setCursor = require('../../lib/setcursor');
 var clearGlCanvases = require('../../lib/clear_gl_canvases');
 var redrawReglTraces = require('../../plot_api/subroutines').redrawReglTraces;
@@ -922,7 +922,7 @@ proto.updateHoverAndMainDrag = function(fullLayout) {
         zb = dragBox.makeZoombox(zoomlayer, lum, cx, cy, path0);
         zb.attr('fill-rule', 'evenodd');
         corners = dragBox.makeCorners(zoomlayer, cx, cy);
-        clearSelect(gd);
+        clearOutline(gd);
     }
 
     // N.B. this sets scoped 'r0' and 'r1'
@@ -1269,7 +1269,7 @@ proto.updateRadialDrag = function(fullLayout, polarLayout, rngIndex) {
         dragOpts.moveFn = moveFn;
         dragOpts.doneFn = doneFn;
 
-        clearSelect(gd);
+        clearOutline(gd);
     };
 
     dragOpts.clampFn = function(dx, dy) {
@@ -1434,7 +1434,7 @@ proto.updateAngularDrag = function(fullLayout) {
         dragOpts.moveFn = moveFn;
         dragOpts.doneFn = doneFn;
 
-        clearSelect(gd);
+        clearOutline(gd);
     };
 
     // I don't what we should do in this case, skip we now
diff --git a/src/plots/ternary/ternary.js b/src/plots/ternary/ternary.js
@@ -21,7 +21,7 @@ var rectMode = dragHelpers.rectMode;
 var Titles = require('../../components/titles');
 var prepSelect = require('../../components/selections').prepSelect;
 var selectOnClick = require('../../components/selections').selectOnClick;
-var clearSelect = require('../../components/selections').clearSelect;
+var clearOutline = require('../../components/selections').clearOutline;
 var clearSelectionsCache = require('../../components/selections').clearSelectionsCache;
 var constants = require('../cartesian/constants');
 
@@ -484,9 +484,9 @@ var STARTMARKER = 'm0.5,0.5h5v-2h-5v-5h-2v5h-5v2h5v5h2Z';
 // I guess this could be shared with cartesian... but for now it's separate.
 var SHOWZOOMOUTTIP = true;
 
-proto.clearSelect = function() {
+proto.clearOutline = function() {
     clearSelectionsCache(this.dragOptions);
-    clearSelect(this.dragOptions.gd);
+    clearOutline(this.dragOptions.gd);
 };
 
 proto.initInteractions = function() {
@@ -532,7 +532,7 @@ proto.initInteractions = function() {
                 _this.dragOptions.clickFn = clickZoomPan;
                 _this.dragOptions.doneFn = dragDone;
                 panPrep();
-                _this.clearSelect(gd);
+                _this.clearOutline(gd);
             } else if(rectMode(dragModeNow) || freeMode(dragModeNow)) {
                 prepSelect(e, startX, startY, _this.dragOptions, dragModeNow);
             }
@@ -610,7 +610,7 @@ proto.initInteractions = function() {
             })
             .attr('d', 'M0,0Z');
 
-        _this.clearSelect(gd);
+        _this.clearOutline(gd);
     }
 
     function getAFrac(x, y) { return 1 - (y / _this.h); }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ function clearOutlineControllers(gd) {`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`		`-function clearSelect(gd) {`
	`10`	`+function clearOutline(gd) {`
`11`	`11`	`var zoomLayer = gd._fullLayout._zoomlayer;`
`12`	`12`	`if(zoomLayer) {`
`13`	`13`	`// until we get around to persistent selections, remove the outline`
`@@ -21,5 +21,5 @@ function clearSelect(gd) {`
`21`	`21`
`22`	`22`	`module.exports = {`
`23`	`23`	`clearOutlineControllers: clearOutlineControllers,`
`24`		`- clearSelect: clearSelect`
	`24`	`+ clearOutline: clearOutline`
`25`	`25`	`};`