Skip to content

Commit 1a21ad9

Browse files
committed
mv getTargetArray to lib/
- use it in filter and sort modules
1 parent 36f7acd commit 1a21ad9

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

src/lib/index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,17 @@ lib.mergeArray = function(traceAttr, cd, cdAttr) {
344344
}
345345
};
346346

347+
lib.getTargetArray = function(trace, target) {
348+
if(typeof target === 'string' && target) {
349+
var array = lib.nestedProperty(trace, target).get();
350+
351+
return Array.isArray(array) ? array : [];
352+
}
353+
else if(Array.isArray(target)) return target.slice();
354+
355+
return false;
356+
};
357+
347358
/**
348359
* modified version of jQuery's extend to strip out private objs and functions,
349360
* and cut arrays down to first <arraylen> or 1 elements

src/transforms/filter.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ exports.supplyDefaults = function(transformIn) {
144144
exports.calcTransform = function(gd, trace, opts) {
145145
if(!opts.enabled) return;
146146

147-
var target = opts.target,
148-
filterArray = getFilterArray(trace, target),
149-
len = filterArray.length;
147+
var target = opts.target;
148+
var targetArray = Lib.getTargetArray(trace, target);
149+
var len = targetArray.length;
150150

151151
if(!len) return;
152152

src/transforms/sort.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ exports.calcTransform = function(gd, trace, opts) {
7676
if(!opts.enabled) return;
7777

7878
var target = opts.target;
79-
var targetArray = getTargetArray(trace, target);
79+
var targetArray = Lib.getTargetArray(trace, target);
8080
var len = targetArray.length;
8181

8282
if(!len) return;
@@ -98,18 +98,6 @@ exports.calcTransform = function(gd, trace, opts) {
9898
}
9999
};
100100

101-
// TODO reuse for filter.js
102-
function getTargetArray(trace, target) {
103-
if(typeof target === 'string' && target) {
104-
var array = Lib.nestedProperty(trace, target).get();
105-
106-
return Array.isArray(array) ? array : [];
107-
}
108-
else if(Array.isArray(target)) return target.slice();
109-
110-
return false;
111-
}
112-
113101
// TODO reuse for filter.js
114102
function getDataToCoordFunc(gd, trace, target, targetArray) {
115103
var ax;

0 commit comments

Comments
 (0)