X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fgrid.js;h=425d93f67e09bcfcdc22ad95e64b62116eae1b4e;hb=c432a749fa6d9dba4dbdf25e4e56935b91f5a984;hp=06bfcd3c0020062079a6c06d0ae2b254ca919490;hpb=34fc91d4b4fbc25094da3ed5fce35dc517d52eeb;p=dygraphs.git diff --git a/plugins/grid.js b/plugins/grid.js index 06bfcd3..425d93f 100644 --- a/plugins/grid.js +++ b/plugins/grid.js @@ -50,20 +50,20 @@ grid.prototype.willDrawChart = function(e) { var x, y, i, ticks; if (g.getOption('drawYGrid')) { - var axes = ["y","y2"]; - var strokeStyles = [], lineWidths = [], drawGrid = [], stroking = [], strokePattern =[]; - for(var index in axes) { - drawGrid[index] = g.getOptionForAxis("drawGrid",axes[index]); - if(drawGrid[index]) { - strokeStyles[index] = g.getOptionForAxis('gridLineColor',axes[index]); - lineWidths[index] = g.getOptionForAxis('gridLineWidth',axes[index]); - strokePattern[index] = g.getOptionForAxis('gridLinePattern',axes[index]); - stroking[index] = strokePattern[index] && (strokePattern[index].length >= 2); + var axes = ["y", "y2"]; + var strokeStyles = [], lineWidths = [], drawGrid = [], stroking = [], strokePattern = []; + for (var i = 0; i < axes.length; i++) { + drawGrid[i] = g.getOptionForAxis("drawGrid", axes[i]); + if (drawGrid[i]) { + strokeStyles[i] = g.getOptionForAxis('gridLineColor', axes[i]); + lineWidths[i] = g.getOptionForAxis('gridLineWidth', axes[i]); + strokePattern[i] = g.getOptionForAxis('gridLinePattern', axes[i]); + stroking[i] = strokePattern[i] && (strokePattern[i].length >= 2); } } ticks = layout.yticks; ctx.save(); - // draw grids for the differen axes + // draw grids for the different y axes for (i = 0; i < ticks.length; i++) { var axis = ticks[i][0]; if(drawGrid[axis]) { @@ -89,16 +89,17 @@ grid.prototype.willDrawChart = function(e) { ctx.restore(); } - if (g.getOption('drawXGrid') && g.getOptionForAxis("drawGrid",'x')) { + // draw grid for x axis + if (g.getOption('drawXGrid') && g.getOptionForAxis("drawGrid", 'x')) { ticks = layout.xticks; ctx.save(); - var strokePattern = g.getOptionForAxis('gridLinePattern','x'); + var strokePattern = g.getOptionForAxis('gridLinePattern', 'x'); var stroking = strokePattern && (strokePattern.length >= 2); if (stroking) { ctx.installPattern(strokePattern); } - ctx.strokeStyle = g.getOptionForAxis('gridLineColor','x'); - ctx.lineWidth = g.getOptionForAxis('gridLineWidth','x'); + ctx.strokeStyle = g.getOptionForAxis('gridLineColor', 'x'); + ctx.lineWidth = g.getOptionForAxis('gridLineWidth', 'x'); for (i = 0; i < ticks.length; i++) { x = halfUp(area.x + ticks[i][0] * area.w); y = halfDown(area.y + area.h);