diff --git a/src/elements/element.point.js b/src/elements/element.point.js index 2e9275f41..1f7541318 100644 --- a/src/elements/element.point.js +++ b/src/elements/element.point.js @@ -2,7 +2,7 @@ import defaults from '../core/core.defaults'; import Element from '../core/core.element'; -import helpers from '../helpers'; +import {_isPointInArea, drawPoint} from '../helpers/helpers.canvas'; const defaultColor = defaults.color; @@ -70,11 +70,11 @@ class Point extends Element { } // Clipping for Points. - if (chartArea === undefined || helpers.canvas._isPointInArea(me, chartArea)) { + if (chartArea === undefined || _isPointInArea(me, chartArea)) { ctx.strokeStyle = options.borderColor; ctx.lineWidth = options.borderWidth; ctx.fillStyle = options.backgroundColor; - helpers.canvas.drawPoint(ctx, options, me.x, me.y); + drawPoint(ctx, options, me.x, me.y); } } diff --git a/src/elements/element.rectangle.js b/src/elements/element.rectangle.js index 239dd9ebb..977b25697 100644 --- a/src/elements/element.rectangle.js +++ b/src/elements/element.rectangle.js @@ -2,7 +2,7 @@ import defaults from '../core/core.defaults'; import Element from '../core/core.element'; -import helpers from '../helpers'; +import {isObject} from '../helpers/helpers.core'; const defaultColor = defaults.color; @@ -79,7 +79,7 @@ function parseBorderWidth(bar, maxW, maxH) { var skip = parseBorderSkipped(bar); var t, r, b, l; - if (helpers.isObject(value)) { + if (isObject(value)) { t = +value.top || 0; r = +value.right || 0; b = +value.bottom || 0;