Skip to content

Commit 25698d6

Browse files
committed
Decade intervals for time-axis labels.
1 parent 2a2a849 commit 25698d6

File tree

4 files changed

+46
-3
lines changed

4 files changed

+46
-3
lines changed

lib/morris.line.coffee

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,11 @@ secondsSpecHelper = (interval) ->
329329
incr: (d) -> d.setSeconds(d.getSeconds() + interval)
330330

331331
Morris.LABEL_SPECS =
332+
"decade":
333+
span: 172800000000 # 10 * 365 * 24 * 60 * 60 * 1000
334+
start: (d) -> new Date(d.getFullYear() - d.getFullYear() % 10, 0, 1)
335+
fmt: (d) -> "#{d.getFullYear()}"
336+
incr: (d) -> d.setFullYear(d.getFullYear() + 10)
332337
"year":
333338
span: 17280000000 # 365 * 24 * 60 * 60 * 1000
334339
start: (d) -> new Date(d.getFullYear(), 0, 1)
@@ -357,7 +362,7 @@ Morris.LABEL_SPECS =
357362
"second": secondsSpecHelper(1)
358363

359364
Morris.AUTO_LABEL_ORDER = [
360-
"year", "month", "day", "hour",
365+
"decade", "year", "month", "day", "hour",
361366
"30min", "15min", "10min", "5min", "minute",
362367
"30sec", "15sec", "10sec", "5sec", "second"
363368
]

morris.js

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)