archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Call tooltip update even when tooltip has no active elements

Browse Source
This commit is contained in:
Tanner Linsley 2015-10-31 16:07:36 -06:00
parent 2845d39311
commit 753fd79bf3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/core.controller.js
View File

@ -112,7 +112,7 @@
}
},
buildScales: function buildScales() {
// Map of scale ID to scale object so we can lookup later
// Map of scale ID to scale object so we can lookup later
this.scales = {};
// Build the x axes
@ -375,7 +375,8 @@
// Find Active Elements for hover and tooltips
if (e.type == 'mouseout') {
this.active = this.tooltipActive = [];
this.active = this.lastActive = [];
this.tooltipActive = this.lastTooltipActive = [];
} else {
this.active = function() {
switch (this.options.hover.mode) {
@ -466,11 +467,11 @@
_active: this.tooltipActive,
});
this.tooltip.update();
} else {
// Inactive
this.tooltip._model.opacity = 0;
}
this.tooltip.update();
}
// Hover animations
@ -492,16 +493,15 @@
}, this);
// If entering, leaving, or changing elements, animate the change via pivot
if ((!this.lastActive.length && this.active.length) ||
(this.lastActive.length && !this.active.length) ||
(this.lastActive.length && this.active.length && changed) ||
(!this.lastTooltipActive.length && this.tooltipActive.length) ||
(this.lastTooltipActive.length && !this.tooltipActive.length) ||
(this.lastTooltipActive.length && this.tooltipActive.length && changed)) {
if ((this.lastActive.length !== this.active.length) ||
(this.lastActive.length === this.active.length && changed) ||
(this.lastTooltipActive.length !== this.tooltipActive.length) ||
(this.lastTooltipActive.length === this.tooltipActive.length && changed)) {
this.stop();
console.log('render');
// We only need to render at this point. Updating will cause scales to be recomputed generating flicker & using more
// We only need to render at this point. Updating will cause scales to be recomputed generating flicker & using more
// memory than necessary.
this.render(this.options.hover.animationDuration, true);
}