accept targetcalendar if attribute has no allowed calendar

and fix tests

Author: alexcjohnson

src/components/calendars/index.js

@@ -235,8 +235,9 @@ module.exports = {
                 ].join(' ')),
                 targetcalendar: makeAttrs([
                     'Sets the calendar system to use for `target`, if it is an',
-                    'array of dates. If `target` is a string (eg *x*) this is ignored',
-                    'and we use the corresponding trace attribute (eg `xcalendar`).'
+                    'array of dates. If `target` is a string (eg *x*) we use the',
+                    'corresponding trace attribute (eg `xcalendar`) if it exists,',
+                    'even if `targetcalendar` is provided.'
                 ].join(' '))
             }
         }

src/transforms/filter.js

@@ -135,10 +135,21 @@ exports.calcTransform = function(gd, trace, opts) {
 
     if(!len) return;
 
-    var targetCalendar = (typeof target === 'string') ?
-            Lib.nestedProperty(trace, target + 'calendar').get() :
-            opts.targetcalendar,
-        dataToCoord = getDataToCoordFunc(gd, trace, target),
+    var targetCalendar = opts.targetcalendar;
+
+    // even if you provide targetcalendar, if target is a string and there
+    // is a calendar attribute matching target it will get used instead.
+    if(typeof target === 'string') {
+        var attrTargetCalendar = Lib.nestedProperty(trace, target + 'calendar').get();
+        if(attrTargetCalendar) targetCalendar = attrTargetCalendar;
+    }
+
+    // if target points to an axis, use the type we already have for that
+    // axis to find the data type. Otherwise use the values to autotype.
+    var d2cTarget = (target === 'x' || target === 'y' || target === 'z') ?
+        target : filterArray;
+
+    var dataToCoord = getDataToCoordFunc(gd, trace, d2cTarget),
         filterFunc = getFilterFunc(opts, dataToCoord, targetCalendar),
         arrayAttrs = PlotSchema.findArrayAttributes(trace),
         originalArrays = {};

test/image/mocks/world-cals.json

@@ -350,7 +350,7 @@
                 {
                     "type": "filter",
                     "operation": "[]",
-                    "calendar": "jalali",
+                    "valuecalendar": "jalali",
                     "value": [
                         "0818-08",
                         "0819-06"

test/jasmine/tests/plotschema_test.js

@@ -196,7 +196,8 @@ describe('plot schema', function() {
         expect(plotSchema.layout.layoutAttributes.xaxis.calendar.valType).toEqual('enumerated');
         expect(plotSchema.layout.layoutAttributes.scene.xaxis.calendar.valType).toEqual('enumerated');
 
-        expect(plotSchema.transforms.filter.attributes.calendar.valType).toEqual('enumerated');
+        expect(plotSchema.transforms.filter.attributes.valuecalendar.valType).toEqual('enumerated');
+        expect(plotSchema.transforms.filter.attributes.targetcalendar.valType).toEqual('enumerated');
     });
 
     it('should list correct defs', function() {

test/jasmine/tests/transform_filter_test.js

@@ -166,6 +166,28 @@ describe('filter transforms calc:', function() {
         expect(out[0].z).toEqual(['0548-08-07', '0548-09-19']);
     });
 
+    it('should use targetcalendar anyway if there is no matching calendar attribute', function() {
+        // this is the same data as in "filters should handle 3D *z* data"
+        // but with different calendars
+        var out = _transform([Lib.extendDeep({}, base, {
+            type: 'scatter',
+            // the same array as above but in taiwanese dates
+            text: ['0104-07-20', '0105-08-01', '0105-09-01', '0105-10-21', '0105-12-02'],
+            transforms: [{
+                type: 'filter',
+                operation: '>',
+                value: '5776-06-28',
+                valuecalendar: 'hebrew',
+                target: 'text',
+                targetcalendar: 'taiwan'
+            }]
+        })]);
+
+        expect(out[0].x).toEqual([0, 1]);
+        expect(out[0].y).toEqual([1, 2]);
+        expect(out[0].text).toEqual(['0105-10-21', '0105-12-02']);
+    });
+
     it('should use targetcalendar if target is an array', function() {
         // this is the same data as in "filters should handle 3D *z* data"
         // but with different calendars