Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-10 21:36:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed flying legend issues

Browse Source 
Sometimes the legend does not display correctly as outerWidth and outerHeight of the rows do not return a number, returning the element itself instead. If you pass an additional parameter to these two functions (includeMargin) seems to fix the issues.
This commit is contained in:
taxicala 2014-08-27 14:57:53 -03:00
parent ef8b3f3276
commit 007b36d47c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
morris.js
View File

@ -68,7 +68,7 @@ Licensed under the BSD-2-Clause License.
Morris.pad2 = function(number) { Morris.pad2 = function(number) {
return (number < 10 ? '0' : '') + number; return (number < 10 ? '0' : '') + number;
}; };ou
Morris.Grid = (function(_super) { Morris.Grid = (function(_super) {
__extends(Grid, _super); __extends(Grid, _super);
@ -680,8 +680,8 @@ Licensed under the BSD-2-Clause License.
var hoverHeight, hoverWidth, left, parentHeight, parentWidth, top; var hoverHeight, hoverWidth, left, parentHeight, parentWidth, top;
parentWidth = this.options.parent.innerWidth(); parentWidth = this.options.parent.innerWidth();
parentHeight = this.options.parent.innerHeight(); parentHeight = this.options.parent.innerHeight();
hoverWidth = this.el.outerWidth(); hoverWidth = this.el.outerWidth(true);
hoverHeight = this.el.outerHeight(); hoverHeight = this.el.outerHeight(true);
left = Math.min(Math.max(0, x - hoverWidth / 2), parentWidth - hoverWidth); left = Math.min(Math.max(0, x - hoverWidth / 2), parentWidth - hoverWidth);
if (y != null) { if (y != null) {
top = y - hoverHeight - 10; top = y - hoverHeight - 10;