Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make hover animation work #6129

Merged
merged 4 commits into from Mar 21, 2019
Merged

Make hover animation work #6129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ea4f8e
Make hover animation work
nagix Mar 11, 2019
570633c
Optimize final transition
nagix Mar 14, 2019
d8f5ef6
Revert the previous change
nagix Mar 14, 2019
52e6b76
Use helper.extend instead of helper.clone
nagix Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core/core.element.js
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down
7 changes: 7 additions & 0 deletions test/specs/core.element.tests.js
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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 changes: 22 additions & 20 deletions test/specs/core.tooltip.tests.js
View file
Open in desktop
Expand Up @@ -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
}]
}));

Expand Down Expand Up @@ -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
}]
}));

Expand Down Expand Up @@ -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
}]
}));

Expand Down Expand Up @@ -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
Expand All @@ -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
}]
}));

Expand Down Expand Up @@ -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
Expand All @@ -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
}]
}));
});
Expand Down Expand Up @@ -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
}]
}));
});
Expand Down