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

Rename INTERVALS.major to INTERVALS.common #4777

Merged
merged 1 commit into from
Sep 29, 2017
Merged

Rename INTERVALS.major to INTERVALS.common #4777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions src/scales/scale.time.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,47 +13,47 @@ var MAX_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;

var INTERVALS = {
millisecond: {
major: true,
common: true,
size: 1,
steps: [1, 2, 5, 10, 20, 50, 100, 250, 500]
},
second: {
major: true,
common: true,
size: 1000,
steps: [1, 2, 5, 10, 30]
},
minute: {
major: true,
common: true,
size: 60000,
steps: [1, 2, 5, 10, 30]
},
hour: {
major: true,
common: true,
size: 3600000,
steps: [1, 2, 3, 6, 12]
},
day: {
major: true,
common: true,
size: 86400000,
steps: [1, 2, 5]
},
week: {
major: false,
common: false,
size: 604800000,
steps: [1, 2, 3, 4]
},
month: {
major: true,
common: true,
size: 2.628e9,
steps: [1, 2, 3]
},
quarter: {
major: false,
common: false,
size: 7.884e9,
steps: [1, 2, 3, 4]
},
year: {
major: true,
common: true,
size: 3.154e10
}
};
Expand Down Expand Up @@ -261,7 +261,7 @@ function determineUnit(minUnit, min, max, capacity) {
interval = INTERVALS[UNITS[i]];
factor = interval.steps ? interval.steps[interval.steps.length - 1] : MAX_INTEGER;

if (Math.ceil((max - min) / (factor * interval.size)) <= capacity) {
if (interval.common && Math.ceil((max - min) / (factor * interval.size)) <= capacity) {
return UNITS[i];
}
}
Expand All @@ -271,7 +271,7 @@ function determineUnit(minUnit, min, max, capacity) {

function determineMajorUnit(unit) {
for (var i = UNITS.indexOf(unit) + 1, ilen = UNITS.length; i < ilen; ++i) {
if (INTERVALS[UNITS[i]].major) {
if (INTERVALS[UNITS[i]].common) {
return UNITS[i];
}
}
Expand Down