@@ -15,8 +15,7 @@ var axisIds = require('../plots/cartesian/axis_ids');
15
15
var autoType = require ( '../plots/cartesian/axis_autotype' ) ;
16
16
var setConvert = require ( '../plots/cartesian/set_convert' ) ;
17
17
18
- var COMPARISON_OPS = [ '=' , '!=' ] ;
19
- var INEQUALITY_OPS = [ '<' , '>=' , '>' , '<=' ] ;
18
+ var COMPARISON_OPS = [ '=' , '!=' , '<' , '>=' , '>' , '<=' ] ;
20
19
var INTERVAL_OPS = [ '[]' , '()' , '[)' , '(]' , '][' , ')(' , '](' , ')[' ] ;
21
20
var SET_OPS = [ '{}' , '}{' ] ;
22
21
@@ -54,7 +53,6 @@ exports.attributes = {
54
53
valType : 'enumerated' ,
55
54
values : [ ]
56
55
. concat ( COMPARISON_OPS )
57
- . concat ( INEQUALITY_OPS )
58
56
. concat ( INTERVAL_OPS )
59
57
. concat ( SET_OPS ) ,
60
58
dflt : '=' ,
@@ -94,16 +92,15 @@ exports.attributes = {
94
92
'to *target*.' ,
95
93
96
94
'When `operation` is set to one of' ,
97
- 'the comparison or (' + COMPARISON_OPS + ')' ,
98
- 'inequality values (' + INEQUALITY_OPS + ')' ,
95
+ 'the comparison values (' + COMPARISON_OPS + ')' ,
99
96
'*value* is expected to be a number or a string.' ,
100
97
101
- 'When `operation` is set to one of the interval value ' ,
98
+ 'When `operation` is set to one of the interval values ' ,
102
99
'(' + INTERVAL_OPS + ')' ,
103
100
'*value* is expected to be 2-item array where the first item' ,
104
101
'is the lower bound and the second item is the upper bound.' ,
105
102
106
- 'When `operation`, is set to one of the set value ' ,
103
+ 'When `operation`, is set to one of the set values ' ,
107
104
'(' + SET_OPS + ')' ,
108
105
'*value* is expected to be an array with as many items as' ,
109
106
'the desired set elements.'
@@ -274,7 +271,7 @@ function getFilterFunc(opts, d2c, targetCalendar) {
274
271
275
272
var coercedValue ;
276
273
277
- if ( isOperationIn ( COMPARISON_OPS ) || isOperationIn ( INEQUALITY_OPS ) ) {
274
+ if ( isOperationIn ( COMPARISON_OPS ) ) {
278
275
coercedValue = hasArrayValue ? d2cValue ( value [ 0 ] ) : d2cValue ( value ) ;
279
276
}
280
277
else if ( isOperationIn ( INTERVAL_OPS ) ) {
0 commit comments