Skip to content
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

Jump to bottom

Implemented aligment by senior unit in time axis. #4267

Merged
merged 9 commits into from May 29, 2017
Merged

Implemented aligment by senior unit in time axis. #4267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4888830
Implemented aligment by senior unit in time axis.
May 16, 2017
a47c7e3
Changed seniorUnit to majorUnit. Added majorUnit check.
May 19, 2017
90eeedd
Time scale majorUnit alignment fixes.
May 18, 2017
9d90575
Scale time tests fix.
May 19, 2017
a6fba63
Renamed seniorDisplayFormat to majorDisplayFormat. Changed aligned ti…
May 22, 2017
deee58f
Added major tick determining in timeHelpers.
May 26, 2017
d7424cf
Added caching of options.majorUnit at timeHelpers. Added alignment of…
May 29, 2017
3f39647
Minor fixes.
May 29, 2017
abe456f
Removed redundant majorUnitStart assignment at timeHelpers.
May 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/helpers/helpers.time.js
View file
Open in desktop
Expand Up @@ -56,11 +56,8 @@ module.exports = function(Chart) {
if (options.maxTicks) {
var stepSize = options.stepSize;
var startTick = options.min !== undefined ? options.min : niceRange.min;
var majorUnitStart = startTick;
var majorUnit = options.majorUnit;
if (majorUnit) {
majorUnitStart = moment(startTick).add(1, majorUnit).startOf(majorUnit);
}
var majorUnitStart = majorUnit ? majorUnitStart = moment(startTick).add(1, majorUnit).startOf(majorUnit) : startTick;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line has majorUnitStart = twice. You only need it once:

var majorUnitStart = majorUnit ? moment(startTick).add(1, majorUnit).startOf(majorUnit) : startTick;

var startRange = majorUnitStart.valueOf() - startTick;
var stepValue = interval[options.unit].size * stepSize;
var startFraction = startRange % stepValue;
Expand Down
2 changes: 1 addition & 1 deletion test/specs/scale.time.tests.js
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@ describe('Time scale tests', function() {
displayFormat: false,
minUnit: 'millisecond',
displayFormats: {
millisecond: 'h:mm:ss.SSS a', // 11:20:01.123 AM,
millisecond: 'h:mm:ss.SSS a', // 11:20:01.123 AM
second: 'h:mm:ss a', // 11:20:01 AM
minute: 'h:mm:ss a', // 11:20:01 AM
hour: 'MMM D, hA', // Sept 4, 5PM
Expand Down