X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-tickers.js;h=a3fe90a14f87fdf384d6317c8f4632cb4bc7a38a;hb=bf5d26a5d349331ab3beba79702692711e9de17c;hp=f4778b12b7a3ddc918bcafcc61800bbe914809c3;hpb=400a62b3df5b199814df17d57423f8c789d132de;p=dygraphs.git diff --git a/dygraph-tickers.js b/dygraph-tickers.js index f4778b1..a3fe90a 100644 --- 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; - for (i = 0; i < nTicks; i++) { + for (i = 0; i <= nTicks; i++) { 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 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++) { - 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)