Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 04:39:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1840 from nnnick/fix/1731-part-2

Browse Source 
Better handling of large tooltips
This commit is contained in:
Evert Timberg 2016-01-02 20:16:37 -05:00
commit 579e322809
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,13 +352,19 @@
this._model.yAlign = 'bottom'; this._model.yAlign = 'bottom';
} }
var lf, rf; var lf, rf; // functions to determine left, right alignment
var olf, orf; // functions to determine if left/right alignment causes tooltip to go outside chart
var yf; // function to get the y alignment if the tooltip goes outside of the left or right edges
var _this = this; var _this = this;
var midX = (this._chartInstance.chartArea.left + this._chartInstance.chartArea.right) / 2; var midX = (this._chartInstance.chartArea.left + this._chartInstance.chartArea.right) / 2;
var midY = (this._chartInstance.chartArea.top + this._chartInstance.chartArea.bottom) / 2;
if (this._model.yAlign === 'center') { if (this._model.yAlign === 'center') {
lf = function(x) { return x <= midX; }; lf = function(x) { return x <= midX; };
rf = function(x) { return x > midX; }; rf = function(x) { return x > midX; };
olf = function(x) { return x + size.width > _this._chart.width; };
orf = function(x) { return x - size.width < 0; };
yf = function(y) { return y <= midY ? 'top' : 'bottom'; };
} else { } else {
lf = function(x) { return x <= (size.width / 2); }; lf = function(x) { return x <= (size.width / 2); };
rf = function(x) { return x >= (_this._chart.width - (size.width / 2)); }; rf = function(x) { return x >= (_this._chart.width - (size.width / 2)); };
@ -366,8 +372,20 @@
if (lf(this._model.x)) { if (lf(this._model.x)) {
this._model.xAlign = 'left'; this._model.xAlign = 'left';
// Is tooltip too wide and goes over the right side of the chart.?
if (olf(this._model.x)) {
this._model.xAlign = 'center';
this._model.yAlign = yf(this._model.y);
}
} else if (rf(this._model.x)) { } else if (rf(this._model.x)) {
this._model.xAlign = 'right'; this._model.xAlign = 'right';
// Is tooltip too wide and goes outside left edge of canvas?
if (orf(this._model.x)) {
this._model.xAlign = 'center';
this._model.yAlign = yf(this._model.y);
}
} }
}, },
getBackgroundPoint: function getBackgroundPoint(vm, size) { getBackgroundPoint: function getBackgroundPoint(vm, size) {