projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #305 from brentwalther/master
[dygraphs.git]
/
dygraph-tickers.js
diff --git
a/dygraph-tickers.js
b/dygraph-tickers.js
index
f4778b1
..
a3fe90a
100644
(file)
--- a/
dygraph-tickers.js
+++ b/
dygraph-tickers.js
@@
-184,7
+184,7
@@
Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
// Construct the set of ticks.
// Allow reverse y-axis if it's explicitly requested.
if (low_val > high_val) scale *= -1;
// Construct the set of ticks.
// Allow reverse y-axis if it's explicitly requested.
if (low_val > high_val) scale *= -1;
- for (i = 0; i < nTicks; i++) {
+ for (i = 0; i <
=
nTicks; i++) {
tickV = low_val + i * scale;
ticks.push( {v: tickV} );
}
tickV = low_val + i * scale;
ticks.push( {v: tickV} );
}
@@
-456,12
+456,12
@@
Dygraph.getDateAxis = function(start_time, end_time, granularity, opts, dg) {
var start_year = new Date(start_time).getFullYear();
var end_year = new Date(end_time).getFullYear();
var start_year = new Date(start_time).getFullYear();
var end_year = new Date(end_time).getFullYear();
- var zeropad = Dygraph.zeropad;
for (var i = start_year; i <= end_year; i++) {
if (i % year_mod !== 0) continue;
for (var j = 0; j < months.length; j++) {
for (var i = start_year; i <= end_year; i++) {
if (i % year_mod !== 0) continue;
for (var j = 0; j < months.length; j++) {
- var date_str = i + "/" + zeropad(1 + months[j]) + "/01";
- t = Dygraph.dateStrToMillis(date_str);
+ var dt = new Date(i, months[j], 1);
+ dt.setFullYear(i);
+ t = dt.getTime();
if (t < start_time || t > end_time) continue;
ticks.push({ v:t,
label: formatter(new Date(t), granularity, opts, dg)
if (t < start_time || t > end_time) continue;
ticks.push({ v:t,
label: formatter(new Date(t), granularity, opts, dg)