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

Fix hover animations and optimize pivot() (#6129)

Browse Source
This commit is contained in:
Akihiko Kusanagi
2019-03-21 16:03:39 +08:00
committed by Simon Brunel
parent 0d8b8f637f
commit 86ed35446d
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/core.element.js
View File

@@ -66,7 +66,7 @@ helpers.extend(Element.prototype, {
pivot: function() {
var me = this;
if (!me._view) {
me._view = helpers.clone(me._model);
me._view = helpers.extend({}, me._model);
}
me._start = {};
return me;
@@ -80,7 +80,7 @@ helpers.extend(Element.prototype, {
// No animation -> No Transition
if (!model || ease === 1) {
me._view = model;
me._view = helpers.extend({}, model);
me._start = null;
return me;
}

7
test/specs/core.element.tests.js
View File

@@ -18,6 +18,7 @@ describe('Core element tests', function() {
element.transition(0.25);
expect(element._view).toEqual(element._model);
expect(element._view).not.toBe(element._model);
expect(element._view.objectProp).toBe(element._model.objectProp); // not cloned
element._model.numberProp = 100;
@@ -40,5 +41,11 @@ describe('Core element tests', function() {
},
colorProp: 'rgb(64, 64, 0)',
});
// Final transition clones model into view
element.transition(1);
expect(element._view).toEqual(element._model);
expect(element._view).not.toBe(element._model);
});
});

42
test/specs/core.tooltip.tests.js
View File

@@ -137,11 +137,11 @@ describe('Core.Tooltip', function() {
footer: [],
caretPadding: 2,
labelColors: [{
borderColor: 'rgb(255, 0, 0)',
backgroundColor: 'rgb(0, 255, 0)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}, {
borderColor: 'rgb(0, 0, 255)',
backgroundColor: 'rgb(0, 255, 255)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}]
}));
@@ -338,8 +338,8 @@ describe('Core.Tooltip', function() {
caretPadding: 2,
labelTextColors: ['#fff'],
labelColors: [{
borderColor: 'rgb(255, 0, 0)',
backgroundColor: 'rgb(0, 255, 0)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}]
}));
@@ -488,11 +488,11 @@ describe('Core.Tooltip', function() {
caretPadding: 2,
labelTextColors: ['labelTextColor', 'labelTextColor'],
labelColors: [{
borderColor: 'rgb(255, 0, 0)',
backgroundColor: 'rgb(0, 255, 0)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}, {
borderColor: 'rgb(0, 0, 255)',
backgroundColor: 'rgb(0, 255, 255)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}]
}));
@@ -547,6 +547,7 @@ describe('Core.Tooltip', function() {
// Check and see if tooltip was displayed
var tooltip = chart.tooltip;
var globalDefaults = Chart.defaults.global;
expect(tooltip._view).toEqual(jasmine.objectContaining({
// Positioning
@@ -568,11 +569,11 @@ describe('Core.Tooltip', function() {
afterBody: [],
footer: [],
labelColors: [{
borderColor: 'rgb(0, 0, 255)',
backgroundColor: 'rgb(0, 255, 255)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}, {
borderColor: 'rgb(255, 0, 0)',
backgroundColor: 'rgb(0, 255, 0)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}]
}));
@@ -629,6 +630,7 @@ describe('Core.Tooltip', function() {
// Check and see if tooltip was displayed
var tooltip = chart.tooltip;
var globalDefaults = Chart.defaults.global;
expect(tooltip._view).toEqual(jasmine.objectContaining({
// Positioning
@@ -646,8 +648,8 @@ describe('Core.Tooltip', function() {
afterBody: [],
footer: [],
labelColors: [{
borderColor: 'rgb(0, 0, 255)',
backgroundColor: 'rgb(0, 255, 255)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}]
}));
});
@@ -1088,11 +1090,11 @@ describe('Core.Tooltip', function() {
caretPadding: 2,
labelTextColors: ['labelTextColor', 'labelTextColor'],
labelColors: [{
borderColor: 'rgb(255, 0, 0)',
backgroundColor: 'rgb(0, 255, 0)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}, {
borderColor: 'rgb(0, 0, 255)',
backgroundColor: 'rgb(0, 255, 255)'
borderColor: globalDefaults.defaultColor,
backgroundColor: globalDefaults.defaultColor
}]
}));
});