Removed 'background' from hover color helper name.

Patterns could be used for style attributes other than background e.g. stroke. Updates  chartjs/Chart.js#1323

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 4039bcf55c30ea9c598f7fdbbf8c1e014336f4bd..ede9d9ba903fb5f8ff1415fd31d46e0505ae556b 100644 (file)
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -250,7 +250,7 @@ module.exports = function(Chart) {
                        var dataset = this.chart.data.datasets[arc._datasetIndex];
                        var index = arc._index;
 
-                       arc._model.backgroundColor = arc.custom && arc.custom.hoverBackgroundColor ? arc.custom.hoverBackgroundColor : helpers.getValueAtIndexOrDefault(dataset.hoverBackgroundColor, index, helpers.getHoverBackgroundColor(arc._model.backgroundColor));
+                       arc._model.backgroundColor = arc.custom && arc.custom.hoverBackgroundColor ? arc.custom.hoverBackgroundColor : helpers.getValueAtIndexOrDefault(dataset.hoverBackgroundColor, index, helpers.getHoverColor(arc._model.backgroundColor));
                        arc._model.borderColor = arc.custom && arc.custom.hoverBorderColor ? arc.custom.hoverBorderColor : helpers.getValueAtIndexOrDefault(dataset.hoverBorderColor, index, helpers.color(arc._model.borderColor).saturate(0.5).darken(0.1).rgbString());
                        arc._model.borderWidth = arc.custom && arc.custom.hoverBorderWidth ? arc.custom.hoverBorderWidth : helpers.getValueAtIndexOrDefault(dataset.hoverBorderWidth, index, arc._model.borderWidth);
                },

diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 3f09d5cfb8db8b4671c3f8845d1327b7f4268e16..60673d8fa9cbd6f01a59716544aed24bb8b6389c 100644 (file)
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -943,9 +943,9 @@ module.exports = function(Chart) {
                        fn.apply(_tArg, args);
                }
        };
-       helpers.getHoverBackgroundColor = function(backgroundColor) {
-               return (backgroundColor instanceof CanvasPattern) ?
-                       backgroundColor :
-                       helpers.color(backgroundColor).saturate(0.5).darken(0.1).rgbString();
+       helpers.getHoverColor = function(color) {
+               return (color instanceof CanvasPattern) ?
+                       color :
+                       helpers.color(color).saturate(0.5).darken(0.1).rgbString();
        };
 };

diff --git a/test/core.helpers.tests.js b/test/core.helpers.tests.js
index bea31e1ea7753dd5bcdbf6cd1c5a3f3cabbb1c0b..2aa6c37e1526626c8caf2c63f7a65f2808f3896a 100644 (file)
--- a/test/core.helpers.tests.js
+++ b/test/core.helpers.tests.js
@@ -684,8 +684,8 @@ describe('Core helper tests', function() {
                });
        });
 
-       describe('Background canvas hover helper', function() {
-               it('should return a CanvasPattern backgroundColor when called with a CanvasPattern', function(done) {
+       describe('Background hover color helper', function() {
+               it('should return a CanvasPattern when called with a CanvasPattern', function(done) {
                        var dots = new Image();
                        dots.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAAD1BMVEUAAAD///////////////+PQt5oAAAABXRSTlMAHlFhZsfk/BEAAAAqSURBVHgBY2BgZGJmYmSAAUYWEIDzmcBcJhiXGcxlRpPFrhdmMiqgvX0AcGIBEUAo6UAAAAAASUVORK5CYII=';
                        dots.onload = function() {
@@ -695,7 +695,7 @@ describe('Core helper tests', function() {
                                var pattern = patternContext.createPattern(dots, 'repeat');
                                patternContext.fillStyle = pattern;
 
-                               var backgroundColor = helpers.getHoverBackgroundColor(chartContext.createPattern(patternCanvas, 'repeat'));
+                               var backgroundColor = helpers.getHoverColor(chartContext.createPattern(patternCanvas, 'repeat'));
 
                                expect(backgroundColor instanceof CanvasPattern).toBe(true);
 
@@ -703,10 +703,10 @@ describe('Core helper tests', function() {
                        }
                });
 
-               it('should return a modified version of backgroundColor when called with a color', function() {
+               it('should return a modified version of color when called with a color', function() {
                        var originalColorRGB = 'rgb(70, 191, 189)';
 
-                       expect(helpers.getHoverBackgroundColor('#46BFBD')).not.toEqual(originalColorRGB);
+                       expect(helpers.getHoverColor('#46BFBD')).not.toEqual(originalColorRGB);
                });
        });
 });