Thanks to visit codestin.com
Credit goes to github.com

Skip to content

filters use valuecalendar and targetcalendar instead of calendar #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcjohnson merged 3 commits into from
Dec 14, 2016
Merged

filters use valuecalendar and targetcalendar instead of calendar #1253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f833c1e
filters use valuecalendar and targetcalendar instead of calendar
alexcjohnson Dec 14, 2016
554d95e
accept targetcalendar if attribute has no allowed calendar
alexcjohnson Dec 14, 2016
3764bcc
backward compat calendar -> valuecalendar in filters
alexcjohnson Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
backward compat calendar -> valuecalendar in filters
  • Loading branch information
@alexcjohnson
alexcjohnson committed Dec 14, 2016
commit 3764bcc42227462cb17bd8cc363c54547b372268
7 changes: 7 additions & 0 deletions src/plot_api/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
}
Expand Down
30 changes: 30 additions & 0 deletions test/jasmine/tests/plot_api_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [{}];

Expand Down