Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 04:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't draw tick across axis/border (#5178)

Browse Source
This commit is contained in:
Jackson Haenchen 2018-01-28 11:59:22 -06:00 committed by Simon Brunel
parent 98ef3942d9
commit e61392a256
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/core.scale.js
View File

@ -705,10 +705,11 @@ module.exports = function(Chart) {
var itemsToDraw = [];
var xTickStart = options.position === 'right' ? me.left : me.right - tl;
var xTickEnd = options.position === 'right' ? me.left + tl : me.right;
var yTickStart = options.position === 'bottom' ? me.top : me.bottom - tl;
var yTickEnd = options.position === 'bottom' ? me.top + tl : me.bottom;
var axisWidth = me.options.gridLines.lineWidth;
var xTickStart = options.position === 'right' ? me.right : me.right - axisWidth - tl;
var xTickEnd = options.position === 'right' ? me.right + tl : me.right;
var yTickStart = options.position === 'bottom' ? me.top + axisWidth : me.bottom - tl - axisWidth;
var yTickEnd = options.position === 'bottom' ? me.top + axisWidth + tl : me.bottom + axisWidth;
helpers.each(ticks, function(tick, index) {
// autoskipper skipped this tick (#4635)
@ -764,7 +765,7 @@ module.exports = function(Chart) {
ty1 = yTickStart;
ty2 = yTickEnd;
y1 = chartArea.top;
y2 = chartArea.bottom;
y2 = chartArea.bottom + axisWidth;
} else {
var isLeft = options.position === 'left';
var labelXOffset;
@ -790,7 +791,7 @@ module.exports = function(Chart) {
tx1 = xTickStart;
tx2 = xTickEnd;
x1 = chartArea.left;
x2 = chartArea.right;
x2 = chartArea.right + axisWidth;
ty1 = ty2 = y1 = y2 = yLineValue;
}
@ -906,9 +907,9 @@ module.exports = function(Chart) {
context.lineWidth = helpers.valueAtIndexOrDefault(gridLines.lineWidth, 0);
context.strokeStyle = helpers.valueAtIndexOrDefault(gridLines.color, 0);
var x1 = me.left;
var x2 = me.right;
var x2 = me.right + axisWidth;
var y1 = me.top;
var y2 = me.bottom;
var y2 = me.bottom + axisWidth;
var aliasPixel = helpers.aliasPixel(context.lineWidth);
if (isHorizontal) {