Skip to content

Commit 70a0f68

Browse files
committed
rename to _indexToPoints
1 parent 039d9b6 commit 70a0f68

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

src/transforms/aggregate.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ exports.calcTransform = function(gd, trace, opts) {
221221
var indexToPoints = {};
222222
var groupings = [];
223223

224-
var prevTransforms = trace.transforms.filter(function(tr) {return tr.indexToPoints;});
224+
var prevTransforms = trace.transforms.filter(function(tr) {return tr._indexToPoints;});
225225
var originalPointsAccessor = prevTransforms.length ?
226-
function(i) {return prevTransforms[prevTransforms.length - 1].indexToPoints[i];} :
226+
function(i) {return prevTransforms[prevTransforms.length - 1]._indexToPoints[i];} :
227227
function(i) {return [i];};
228228

229229
for(i = 0; i < groupArray.length; i++) {
@@ -241,7 +241,7 @@ exports.calcTransform = function(gd, trace, opts) {
241241
}
242242
}
243243

244-
opts.indexToPoints = indexToPoints;
244+
opts._indexToPoints = indexToPoints;
245245

246246
var aggregations = opts.aggregations;
247247

src/transforms/filter.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ exports.calcTransform = function(gd, trace, opts) {
205205
// copy all original array attribute values, and clear arrays in trace
206206
forAllAttrs(initFn);
207207

208-
var prevTransforms = trace.transforms.filter(function(tr) {return tr.indexToPoints;});
208+
var prevTransforms = trace.transforms.filter(function(tr) {return tr._indexToPoints;});
209209
var originalPointsAccessor = prevTransforms.length ?
210-
function(i) {return prevTransforms[prevTransforms.length - 1].indexToPoints[i];} :
210+
function(i) {return prevTransforms[prevTransforms.length - 1]._indexToPoints[i];} :
211211
function(i) {return [i];};
212212

213213
// loop through filter array, fill trace arrays if passed
@@ -219,7 +219,7 @@ exports.calcTransform = function(gd, trace, opts) {
219219
}
220220
}
221221

222-
opts.indexToPoints = indexToPoints;
222+
opts._indexToPoints = indexToPoints;
223223
};
224224

225225
function getFilterFunc(opts, d2c, targetCalendar) {

test/jasmine/tests/transform_aggregate_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('aggregate', function() {
6161
expect(traceOut.marker.line.width).toEqual([4, 1]);
6262

6363
var transform = traceOut.transforms[0];
64-
var inverseMapping = transform.indexToPoints;
64+
var inverseMapping = transform._indexToPoints;
6565
expect(inverseMapping).toEqual({0: [0, 2, 3, 4], 1: [1]});
6666
});
6767

@@ -169,7 +169,7 @@ describe('aggregate', function() {
169169
expect(traceOut.text).toEqual(['b', 'b']);
170170

171171
var transform = traceOut.transforms[0];
172-
var inverseMapping = transform.indexToPoints;
172+
var inverseMapping = transform._indexToPoints;
173173
expect(inverseMapping).toEqual({0: [0, 1], 1: [2, 3]});
174174
});
175175

@@ -195,7 +195,7 @@ describe('aggregate', function() {
195195
expect(traceOut.marker.size).toEqual([10, 20]);
196196

197197
var transform = traceOut.transforms[0];
198-
var inverseMapping = transform.indexToPoints;
198+
var inverseMapping = transform._indexToPoints;
199199
expect(inverseMapping).toEqual({0: [0, 1, 4], 1: [2, 3]});
200200
});
201201

@@ -217,7 +217,7 @@ describe('aggregate', function() {
217217
expect(traceOut.marker.size).toEqual([10, 20]);
218218

219219
var transform = traceOut.transforms[0];
220-
var inverseMapping = transform.indexToPoints;
220+
var inverseMapping = transform._indexToPoints;
221221
expect(inverseMapping).toEqual({0: [0, 1, 4], 1: [2, 3]});
222222
});
223223

test/jasmine/tests/transform_filter_test.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ describe('filter transforms calc:', function() {
143143
expect(out[0].x).toEqual([0, 1]);
144144
expect(out[0].y).toEqual([1, 2]);
145145
expect(out[0].z).toEqual(['2016-10-21', '2016-12-02']);
146-
expect(out[0].transforms[0].indexToPoints).toEqual({0: [3], 1: [4]});
146+
expect(out[0].transforms[0]._indexToPoints).toEqual({0: [3], 1: [4]});
147147
});
148148

149149
it('should use the calendar from the target attribute if target is a string', function() {
@@ -262,7 +262,7 @@ describe('filter transforms calc:', function() {
262262
expect(out[0].x).toEqual([-2, 2, 3]);
263263
expect(out[0].y).toEqual([3, 3, 1]);
264264
expect(out[0].marker.color).toEqual([0.3, 0.3, 0.4]);
265-
expect(out[0].transforms[0].indexToPoints).toEqual({0: [2], 1: [5], 2: [6]});
265+
expect(out[0].transforms[0]._indexToPoints).toEqual({0: [2], 1: [5], 2: [6]});
266266
});
267267

268268
it('filters should handle array on base trace attributes', function() {
@@ -316,8 +316,8 @@ describe('filter transforms calc:', function() {
316316

317317
expect(out[0].x).toEqual([1, 2]);
318318
expect(out[0].y).toEqual([2, 3]);
319-
expect(out[0].transforms[0].indexToPoints).toEqual({0: [4], 1: [5], 2: [6]});
320-
expect(out[0].transforms[1].indexToPoints).toEqual({0: [4], 1: [5]});
319+
expect(out[0].transforms[0]._indexToPoints).toEqual({0: [4], 1: [5], 2: [6]});
320+
expect(out[0].transforms[1]._indexToPoints).toEqual({0: [4], 1: [5]});
321321
});
322322

323323
it('filters should chain as AND (case 2)', function() {
@@ -343,8 +343,8 @@ describe('filter transforms calc:', function() {
343343

344344
expect(out[0].x).toEqual([3]);
345345
expect(out[0].y).toEqual([1]);
346-
expect(out[0].transforms[0].indexToPoints).toEqual({0: [4], 1: [5], 2: [6]});
347-
expect(out[0].transforms[2].indexToPoints).toEqual({0: [6]});
346+
expect(out[0].transforms[0]._indexToPoints).toEqual({0: [4], 1: [5], 2: [6]});
347+
expect(out[0].transforms[2]._indexToPoints).toEqual({0: [6]});
348348
});
349349

350350
it('should preserve gaps in data when `preservegaps` is turned on', function() {

test/jasmine/tests/transform_multi_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ describe('multiple transforms:', function() {
322322
expect(gd._fullData[0].y).toEqual([9]);
323323
expect(gd._fullData[0].marker.size).toEqual([10]);
324324

325-
expect(gd._fullData[0].transforms[0].indexToPoints).toEqual({0: [1], 1: [3], 2: [4]});
326-
expect(gd._fullData[0].transforms[1].indexToPoints).toEqual({0: [1, 3], 1: [4]});
327-
expect(gd._fullData[0].transforms[2].indexToPoints).toEqual({0: [4]});
325+
expect(gd._fullData[0].transforms[0]._indexToPoints).toEqual({0: [1], 1: [3], 2: [4]});
326+
expect(gd._fullData[0].transforms[1]._indexToPoints).toEqual({0: [1, 3], 1: [4]});
327+
expect(gd._fullData[0].transforms[2]._indexToPoints).toEqual({0: [4]});
328328

329329
done();
330330
});

0 commit comments

Comments
 (0)