blob42
/
nvd3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing tooltip flickering on IE.

Browse Source 
Bumping development version # to 1.1.0b, as new significant features have been added.
Rebuilding nv.d3.js
master
Robin Hu 11 years ago
parent d978f38436
commit 229cbd5121
5 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File

18
nv.d3.js
Unescape Escape View File

@ -2,7 +2,7 @@
var nv = window.nv || {};
nv.version = '1.0.0b';
nv.version = '1.1.0b';
nv.dev = true //set false when in production
window.nv = nv;
@ -206,7 +206,15 @@ nv.interactiveGuideline = function() {
if (mouseX < 0 || mouseY < 0
|| mouseX > availableWidth || mouseY > availableHeight
|| (d3.event.relatedTarget && d3.event.relatedTarget.ownerSVGElement === undefined)
) {
)
{
if (isMSIE) {
if (d3.event.relatedTarget
&& d3.event.relatedTarget.ownerSVGElement === undefined
&& d3.event.relatedTarget.className.match(tooltip.nvPointerEventsClass)) {
return;
}
}
dispatch.elementMouseout({
mouseX: mouseX,
mouseY: mouseY
@ -377,6 +385,9 @@ window.nv.tooltip.* also has various helper methods.
, id = "nvtooltip-" + Math.floor(Math.random() * 100000)
;
//CSS class to specify whether element should not have mouse events.
var nvPointerEventsClass = "nv-pointer-events-none";
//Format function for the tooltip values column
var valueFormatter = function(d,i) {
return d;
@ -451,6 +462,7 @@ window.nv.tooltip.* also has various helper methods.
container.node().innerHTML = newContent;
container.style("top",0).style("left",0).style("opacity",0);
container.selectAll("div, table, td, tr").classed(nvPointerEventsClass,true)
return container.node();
}
@ -489,6 +501,8 @@ window.nv.tooltip.* also has various helper methods.
return nvtooltip;
};
nvtooltip.nvPointerEventsClass = nvPointerEventsClass;
nvtooltip.content = function(_) {
if (!arguments.length) return content;
content = _;

12
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/core.js
Unescape Escape View File

@ -1,7 +1,7 @@
var nv = window.nv || {};
nv.version = '1.0.0b';
nv.version = '1.1.0b';
nv.dev = true //set false when in production
window.nv = nv;

10
src/interactiveLayer.js
Unescape Escape View File

@ -87,7 +87,15 @@ nv.interactiveGuideline = function() {
if (mouseX < 0 || mouseY < 0
|| mouseX > availableWidth || mouseY > availableHeight
|| (d3.event.relatedTarget && d3.event.relatedTarget.ownerSVGElement === undefined)
) {
)
{
if (isMSIE) {
if (d3.event.relatedTarget
&& d3.event.relatedTarget.ownerSVGElement === undefined
&& d3.event.relatedTarget.className.match(tooltip.nvPointerEventsClass)) {
return;
}
}
dispatch.elementMouseout({
mouseX: mouseX,
mouseY: mouseY

6
src/tooltip.js
Unescape Escape View File

@ -50,6 +50,9 @@ window.nv.tooltip.* also has various helper methods.
, id = "nvtooltip-" + Math.floor(Math.random() * 100000)
;
//CSS class to specify whether element should not have mouse events.
var nvPointerEventsClass = "nv-pointer-events-none";
//Format function for the tooltip values column
var valueFormatter = function(d,i) {
return d;
@ -124,6 +127,7 @@ window.nv.tooltip.* also has various helper methods.
container.node().innerHTML = newContent;
container.style("top",0).style("left",0).style("opacity",0);
container.selectAll("div, table, td, tr").classed(nvPointerEventsClass,true)
return container.node();
}
@ -162,6 +166,8 @@ window.nv.tooltip.* also has various helper methods.
return nvtooltip;
};
nvtooltip.nvPointerEventsClass = nvPointerEventsClass;
nvtooltip.content = function(_) {
if (!arguments.length) return content;
content = _;

Write Preview
Loading…
Cancel
Save