maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3320 from panda01/fix/3309

Browse source 
Fix/3309
This commit is contained in:
Spencer 2015-03-18 09:57:10 -07:00
parent 826879386c 864d8a4651
commit 10573eae4d
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/kibana/components/vislib/components/tooltip/tooltip.js
View file

@ -82,11 +82,14 @@ define(function (require) {
// moving between points doesn't make it reposition
$chart.removeData('previousPlacement');
});
$chart.find('.chart > svg').on('mousemove', function (event) {
event.stopPropagation();
});
selection.each(function (d, i) {
var element = d3.select(this);
function render(html) {
function render(event, html) {
allContents = _.filter(allContents, function (content) {
return content.id !== id;
});
@ -105,7 +108,7 @@ define(function (require) {
$chart: $chart,
$el: $tooltip,
$sizer: $sizer,
event: d3.event
event: event
}, allHtml);
$tooltip
@ -115,6 +118,10 @@ define(function (require) {
left: placement.left,
top: placement.top
});
// add a make sure to remove the tooltip when necessary
$('body').one('mousemove', function (event) {
render(event);
});
} else {
$tooltip.css({
visibility: 'hidden',
@ -127,14 +134,14 @@ define(function (require) {
element
.on('mousemove.tip', function update() {
if (!self.showCondition.call(element, d, i)) {
return render();
return render(d3.event);
}
var events = self.events ? self.events.eventResponse(d, i) : d;
return render(tooltipFormatter(events));
return render(d3.event, tooltipFormatter(events));
})
.on('mouseout.tip', function () {
render();
render(d3.event);
});
});
};