X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=plugins%2Fgrid.js;h=425d93f67e09bcfcdc22ad95e64b62116eae1b4e;hb=0c59a4284a1fe42d254fb07df67d6c01a9577a84;hp=5d9b6c68b0b75b9925ba0161be17a5597fde9bc8;hpb=9e906ae6bedb3afb02015d18d0bc2a42d558aea6;p=dygraphs.git diff --git a/plugins/grid.js b/plugins/grid.js index 5d9b6c6..425d93f 100644 --- a/plugins/grid.js +++ b/plugins/grid.js @@ -50,23 +50,23 @@ 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]){ + if(drawGrid[axis]) { if (stroking[axis]) { ctx.installPattern(strokePattern[axis]); } @@ -84,21 +84,22 @@ grid.prototype.willDrawChart = function(e) { if (stroking[axis]) { ctx.uninstallPattern(); } - } + } } 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); @@ -109,7 +110,7 @@ grid.prototype.willDrawChart = function(e) { ctx.stroke(); } if (stroking) { - ctx.uninstallPattern(); + ctx.uninstallPattern(); } ctx.restore(); }