Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-08 01:06:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed 'background' from hover color helper name.

Browse Source 
Patterns could be used for style attributes other than background e.g. stroke. Updates  chartjs/Chart.js#1323
This commit is contained in:
Tom Loudon
2016-05-09 07:24:32 +01:00
parent 5866f73562
commit 170fdab6a6
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/controller.doughnut.js
View File

@@ -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);
},

8
src/core/core.helpers.js
View File

@@ -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();
};
};

10
test/core.helpers.tests.js
View File

@@ -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);
});
});
});