Skip to content

Commit 6015768

Browse files
timelyportfoliomonfera
timelyportfolio
authored and
monfera
committed
clean and lint
1 parent aa1f1d3 commit 6015768

File tree

2 files changed

+51
-40
lines changed

2 files changed

+51
-40
lines changed

‎src/transforms/filter.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/**
2+
* Copyright 2012-2016, Plotly, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
110
'use strict';
211

312
var isNumeric = require('fast-isnumeric');
@@ -60,7 +69,7 @@ exports.supplyDefaults = function(transformIn, fullData, layout) {
6069
transformOut.value = transformOut.value.map(function(v) {
6170
if(isNumeric(v)) v = +v;
6271
return v;
63-
})
72+
});
6473
} else {
6574
if(isNumeric(transformOut.value)) transformOut.value = +transformOut.value;
6675
}
@@ -137,7 +146,7 @@ function getFilterFunc(opts) {
137146
// filter function will work
138147
// but perhaps should just error out
139148
var valueArr = [];
140-
if (!Array.isArray(value)) {
149+
if(!Array.isArray(value)) {
141150
valueArr = [value, value];
142151
} else {
143152
valueArr = value;
@@ -153,27 +162,27 @@ function getFilterFunc(opts) {
153162
case 'within':
154163
return function(v) {
155164
// if character then ignore with no side effect
156-
function notDateNumber(d){
165+
function notDateNumber(d) {
157166
return !(isNumeric(d) || Lib.isDateTime(d));
158-
};
167+
}
159168
if(valueArr.some(notDateNumber)) {
160169
return true;
161170
}
162171

163172
// keep the = ?
164-
return v >= Math.min.apply( null, valueArr ) &&
165-
v <= Math.max.apply( null, valueArr );
173+
return v >= Math.min.apply(null, valueArr) &&
174+
v <= Math.max.apply(null, valueArr);
166175
};
167176
case 'notwithin':
168177
return function(v) {
169178
// keep the = ?
170-
return !(v >= Math.min.apply( null, valueArr ) &&
171-
v <= Math.max.apply( null, valueArr ));
179+
return !(v >= Math.min.apply(null, valueArr) &&
180+
v <= Math.max.apply(null, valueArr));
172181
};
173182
case 'in':
174-
return function(v) { return valueArr.indexOf(v) >= 0 };
183+
return function(v) { return valueArr.indexOf(v) >= 0; };
175184
case 'notin':
176-
return function(v) { return valueArr.indexOf(v) === -1 };
185+
return function(v) { return valueArr.indexOf(v) === -1; };
177186
}
178187
}
179188

‎test/jasmine/tests/transforms_test.js

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,17 @@ describe('one-to-one transforms:', function() {
3535
}]
3636
}];
3737

38+
var traceIn, traceOut;
39+
3840
afterEach(destroyGraphDiv);
3941

4042
it('supplyTraceDefaults should supply the transform defaults', function() {
41-
var traceIn = {
43+
traceIn = {
4244
y: [2, 1, 2],
4345
transforms: [{ type: 'filter' }]
4446
};
4547

46-
var traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
48+
traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
4749

4850
expect(traceOut.transforms).toEqual([{
4951
type: 'filter',
@@ -54,18 +56,18 @@ describe('one-to-one transforms:', function() {
5456
});
5557

5658
it('supplyTraceDefaults should not bail if transform module is not found', function() {
57-
var traceIn = {
59+
traceIn = {
5860
y: [2, 1, 2],
5961
transforms: [{ type: 'invalid' }]
6062
};
6163

62-
var traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
64+
traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
6365

6466
expect(traceOut.y).toBe(traceIn.y);
6567
});
6668

6769
it('supplyTraceDefaults should honored global transforms', function() {
68-
var traceIn = {
70+
traceIn = {
6971
y: [2, 1, 2],
7072
transforms: [{
7173
type: 'filter',
@@ -81,7 +83,7 @@ describe('one-to-one transforms:', function() {
8183
}]
8284
};
8385

84-
var traceOut = Plots.supplyTraceDefaults(traceIn, 0, layout);
86+
traceOut = Plots.supplyTraceDefaults(traceIn, 0, layout);
8587

8688
expect(traceOut.transforms[0]).toEqual({
8789
type: 'filter',
@@ -140,7 +142,7 @@ describe('one-to-one transforms:', function() {
140142
it('supplyDataDefaults should apply the transform while', function() {
141143
var dataIn = [{
142144
x: [-2, -2, 1, 2, 3],
143-
y: [1, 2, 2, 3, 1],
145+
y: [1, 2, 2, 3, 1]
144146
}, {
145147
x: [-2, -1, -2, 0, 1, 2, 3],
146148
y: [1, 2, 3, 1, 2, 3, 1],
@@ -332,12 +334,12 @@ describe('one-to-one transforms:', function() {
332334

333335

334336
it('supplyTraceDefaults should supply the transform defaults', function() {
335-
var traceIn = {
337+
traceIn = {
336338
y: [2, 1, 2],
337339
transforms: [{ type: 'filter' }]
338340
};
339341

340-
var traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
342+
traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
341343

342344
expect(traceOut.transforms).toEqual([{
343345
type: 'filter',
@@ -348,15 +350,15 @@ describe('one-to-one transforms:', function() {
348350
});
349351

350352
it('supplyTraceDefaults should accept numeric as character', function() {
351-
var traceIn = {
353+
traceIn = {
352354
x: '1',
353355
transforms: [{
354356
type: 'filter',
355357
value: '0'
356358
}]
357359
};
358360

359-
var traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
361+
traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
360362

361363
expect(traceOut.transforms).toEqual([{
362364
type: 'filter',
@@ -366,15 +368,15 @@ describe('one-to-one transforms:', function() {
366368
}]);
367369

368370
// should also convert if array
369-
var traceIn = {
371+
traceIn = {
370372
x: '1',
371373
transforms: [{
372374
type: 'filter',
373375
value: ['0']
374376
}]
375377
};
376378

377-
var traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
379+
traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
378380

379381
expect(traceOut.transforms).toEqual([{
380382
type: 'filter',
@@ -385,15 +387,15 @@ describe('one-to-one transforms:', function() {
385387
});
386388

387389
it('supplyTraceDefaults should accept numeric as character', function() {
388-
var traceIn = {
390+
traceIn = {
389391
x: '1',
390392
transforms: [{
391393
type: 'filter',
392394
value: '0'
393395
}]
394396
};
395397

396-
var traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
398+
traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
397399

398400
expect(traceOut.transforms).toEqual([{
399401
type: 'filter',
@@ -403,15 +405,15 @@ describe('one-to-one transforms:', function() {
403405
}]);
404406

405407
// should also convert if array
406-
var traceIn = {
408+
traceIn = {
407409
x: '1',
408410
transforms: [{
409411
type: 'filter',
410412
value: ['0']
411413
}]
412414
};
413415

414-
var traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
416+
traceOut = Plots.supplyTraceDefaults(traceIn, 0, {});
415417

416418
expect(traceOut.transforms).toEqual([{
417419
type: 'filter',
@@ -479,23 +481,23 @@ describe('one-to-one transforms:', function() {
479481
expect(dataOut[0].index).toEqual(0);
480482
});
481483

482-
it('filters should chain as AND', function(){
484+
it('filters should chain as AND', function() {
483485
var dataIn = [{
484486
x: [-2, -1, -2, 0, 1, 2, 3],
485487
y: [1, 2, 3, 1, 2, 3, 1],
486488
transforms: [
487-
{
488-
type: 'filter',
489-
operation: '>',
490-
value: 0,
491-
filtersrc: 'x'
492-
},
493-
{
494-
type: 'filter',
495-
operation: '<',
496-
value: 3,
497-
filtersrc: 'x'
498-
}
489+
{
490+
type: 'filter',
491+
operation: '>',
492+
value: 0,
493+
filtersrc: 'x'
494+
},
495+
{
496+
type: 'filter',
497+
operation: '<',
498+
value: 3,
499+
filtersrc: 'x'
500+
}
499501
]
500502
}];
501503

0 commit comments

Comments
 (0)