backward compat calendar -> valuecalendar in filters

alexcjohnson · alexcjohnson · commit 3764bcc42227 · 2016-12-14T14:31:02.000-05:00
diff --git a/src/plot_api/helpers.js b/src/plot_api/helpers.js
@@ -353,6 +353,13 @@ exports.cleanData = function(data, existingData) {
                         transform.target = transform.filtersrc;
                         delete transform.filtersrc;
                     }
+
+                    if(transform.calendar) {
+                        if(!transform.valuecalendar) {
+                            transform.valuecalendar = transform.calendar;
+                        }
+                        delete transform.calendar;
+                    }
                 }
             }
         }
diff --git a/test/jasmine/tests/plot_api_test.js b/test/jasmine/tests/plot_api_test.js
@@ -1051,6 +1051,36 @@ describe('Test plot api', function() {
             expect(trace1.transforms[0].target).toEqual('y');
         });
 
+        it('should rename *calendar* to *valuecalendar* in filter transforms', function() {
+            var data = [{
+                transforms: [{
+                    type: 'filter',
+                    target: 'y',
+                    calendar: 'hebrew'
+                }, {
+                    type: 'filter',
+                    operation: '<'
+                }]
+            }, {
+                transforms: [{
+                    type: 'filter',
+                    valuecalendar: 'jalali'
+                }]
+            }];
+
+            Plotly.plot(gd, data);
+
+            var trace0 = gd.data[0],
+                trace1 = gd.data[1];
+
+            expect(trace0.transforms.length).toEqual(2);
+            expect(trace0.transforms[0].calendar).toBeUndefined();
+            expect(trace0.transforms[0].valuecalendar).toEqual('hebrew');
+
+            expect(trace1.transforms.length).toEqual(1);
+            expect(trace1.transforms[0].valuecalendar).toEqual('jalali');
+        });
+
         it('should cleanup annotations / shapes refs', function() {
             var data = [{}];
 

Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,13 @@ exports.cleanData = function(data, existingData) {`
`353`	`353`	`transform.target = transform.filtersrc;`
`354`	`354`	`delete transform.filtersrc;`
`355`	`355`	`}`
	`356`	`+`
	`357`	`+ if(transform.calendar) {`
	`358`	`+ if(!transform.valuecalendar) {`
	`359`	`+ transform.valuecalendar = transform.calendar;`
	`360`	`+ }`
	`361`	`+ delete transform.calendar;`
	`362`	`+ }`
`356`	`363`	`}`
`357`	`364`	`}`
`358`	`365`	`}`