Skip to content

Commit 60317b1

Browse files
committed
Adapt uninitialized var declarations in click-to-select code [1852]
- From one per line to many per line.
1 parent e895efd commit 60317b1

File tree

2 files changed

+9
-28
lines changed

2 files changed

+9
-28
lines changed

src/plots/cartesian/select.js

+7-24
Original file line numberDiff line numberDiff line change
@@ -294,16 +294,8 @@ function selectOnClick(evt, gd, xAxes, yAxes, subplot, dragOptions, polygonOutli
294294
var clickmode = gd._fullLayout.clickmode;
295295
var sendEvents = clickmode.indexOf('event') > -1;
296296
var selection = [];
297-
var searchTraces;
298-
var searchInfo;
299-
var currentSelectionDef;
300-
var selectionTester;
301-
var traceSelection;
302-
var thisTracesSelection;
303-
var pointOrBinSelected;
304-
var subtract;
305-
var eventData;
306-
var i;
297+
var searchTraces, searchInfo, currentSelectionDef, selectionTester, traceSelection;
298+
var thisTracesSelection, pointOrBinSelected, subtract, eventData, i;
307299

308300
if(isHoverDataSet(hoverData)) {
309301
coerceSelectionsCache(evt, gd, dragOptions);
@@ -416,9 +408,7 @@ function determineSearchTraces(gd, xAxes, yAxes, subplot) {
416408
var searchTraces = [];
417409
var xAxisIds = xAxes.map(getAxId);
418410
var yAxisIds = yAxes.map(getAxId);
419-
var cd;
420-
var trace;
421-
var i;
411+
var cd, trace, i;
422412

423413
for(i = 0; i < gd.calcdata.length; i++) {
424414
cd = gd.calcdata[i];
@@ -457,8 +447,7 @@ function determineSearchTraces(gd, xAxes, yAxes, subplot) {
457447

458448
function drawSelection(polygons, outlines) {
459449
var paths = [];
460-
var i;
461-
var d;
450+
var i, d;
462451

463452
for(i = 0; i < polygons.length; i++) {
464453
var ppts = polygons[i];
@@ -481,8 +470,7 @@ function extractClickedPtInfo(hoverData, searchTraces) {
481470
var hoverDatum = hoverData[0];
482471
var pointNumber = -1;
483472
var pointNumbers = [];
484-
var searchInfo;
485-
var i;
473+
var searchInfo, i;
486474

487475
for(i = 0; i < searchTraces.length; i++) {
488476
searchInfo = searchTraces[i];
@@ -536,10 +524,7 @@ function isPointOrBinSelected(clickedPtInfo) {
536524

537525
function isOnlyThisBinSelected(searchTraces, clickedPtInfo) {
538526
var tracesWithSelectedPts = [];
539-
var searchInfo;
540-
var trace;
541-
var isSameTrace;
542-
var i;
527+
var searchInfo, trace, isSameTrace, i;
543528

544529
for(i = 0; i < searchTraces.length; i++) {
545530
searchInfo = searchTraces[i];
@@ -568,9 +553,7 @@ function isOnlyThisBinSelected(searchTraces, clickedPtInfo) {
568553

569554
function isOnlyOnePointSelected(searchTraces) {
570555
var len = 0;
571-
var searchInfo;
572-
var trace;
573-
var i;
556+
var searchInfo, trace, i;
574557

575558
for(i = 0; i < searchTraces.length; i++) {
576559
searchInfo = searchTraces[i];

test/jasmine/tests/select_test.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,7 @@ describe('Click-to-select', function() {
200200
*/
201201
function assertSelectedPoints(expected) {
202202
var expectedPtsPerTrace = toArrayOfArrays(expected);
203-
var expectedPts;
204-
var traceNum;
203+
var expectedPts, traceNum;
205204

206205
for(traceNum = 0; traceNum < expectedPtsPerTrace.length; traceNum++) {
207206
expectedPts = expectedPtsPerTrace[traceNum];
@@ -210,8 +209,7 @@ describe('Click-to-select', function() {
210209
}
211210

212211
function toArrayOfArrays(expected) {
213-
var isArrayInArray;
214-
var i;
212+
var isArrayInArray, i;
215213

216214
if(Array.isArray(expected)) {
217215
isArrayInArray = false;

0 commit comments

Comments
 (0)