]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
get a little more from the point element
authorEvert Timberg <evert.timberg+github@gmail.com>
Sat, 7 May 2016 21:09:17 +0000 (17:09 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Sat, 7 May 2016 21:09:17 +0000 (17:09 -0400)
src/elements/element.point.js

index 93f59be1fd76dcfcd643c67ff9502729346195d7..306a643c533ac727211ef281d09e8fcc8e976251 100644 (file)
@@ -3,14 +3,15 @@
 module.exports = function(Chart) {
 
        var helpers = Chart.helpers,
-               globalOpts = Chart.defaults.global;
+               globalOpts = Chart.defaults.global,
+               defaultColor = globalOpts.defaultColor;
 
        globalOpts.elements.point = {
                radius: 3,
                pointStyle: 'circle',
-               backgroundColor: globalOpts.defaultColor,
+               backgroundColor: defaultColor,
                borderWidth: 1,
-               borderColor: globalOpts.defaultColor,
+               borderColor: defaultColor,
                // Hover
                hitRadius: 1,
                hoverRadius: 4,
@@ -53,10 +54,10 @@ module.exports = function(Chart) {
 
                        if (!isNaN(vm.radius) && vm.radius > 0) {
 
-                               ctx.strokeStyle = vm.borderColor || Chart.defaults.global.defaultColor;
-                               ctx.lineWidth = helpers.getValueOrDefault(vm.borderWidth, Chart.defaults.global.elements.point.borderWidth);
+                               ctx.strokeStyle = vm.borderColor || defaultColor;
+                               ctx.lineWidth = helpers.getValueOrDefault(vm.borderWidth, globalOpts.elements.point.borderWidth);
 
-                               ctx.fillStyle = vm.backgroundColor || Chart.defaults.global.defaultColor;
+                               ctx.fillStyle = vm.backgroundColor || defaultColor;
 
                                var radius = vm.radius;