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

Fixed tooltip offset position

Browse Source
This commit is contained in:
Bob Monteverde 2012-06-12 02:26:57 -04:00
parent 5ad03d6dee
commit 3dab32a401
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/models/discreteBarChart.js
View File

@ -47,10 +47,11 @@ nv.models.discreteBarChart = function() {
function chart(selection) { function chart(selection) {
selection.each(function(data) { selection.each(function(data) {
var container = d3.select(this);
var availableWidth = (width || parseInt(d3.select(this).style('width')) || 960) var availableWidth = (width || parseInt(container.style('width')) || 960)
- margin.left - margin.right, - margin.left - margin.right,
availableHeight = (height || parseInt(d3.select(this).style('height')) || 400) availableHeight = (height || parseInt(container.style('height')) || 400)
- margin.top - margin.bottom; - margin.top - margin.bottom;
@ -59,7 +60,7 @@ nv.models.discreteBarChart = function() {
.height(availableHeight); .height(availableHeight);
var wrap = d3.select(this).selectAll('g.wrap.discreteBarWithAxes').data([data]); var wrap = container.selectAll('g.wrap.discreteBarWithAxes').data([data]);
var gEnter = wrap.enter().append('g').attr('class', 'wrap nvd3 discreteBarWithAxes').append('g'); var gEnter = wrap.enter().append('g').attr('class', 'wrap nvd3 discreteBarWithAxes').append('g');
gEnter.append('g').attr('class', 'x axis'); gEnter.append('g').attr('class', 'x axis');
@ -112,7 +113,7 @@ nv.models.discreteBarChart = function() {
e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top];
dispatch.tooltipShow(e); dispatch.tooltipShow(e);
}); });
if (tooltips) dispatch.on('tooltipShow', function(e) { showTooltip(e, this) } ); // TODO: maybe merge with above? if (tooltips) dispatch.on('tooltipShow', function(e) { showTooltip(e, container[0][0]) } ); // TODO: maybe merge with above?
discretebar.dispatch.on('elementMouseout.tooltip', function(e) { discretebar.dispatch.on('elementMouseout.tooltip', function(e) {
dispatch.tooltipHide(e); dispatch.tooltipHide(e);

9
src/models/lineChart.js
View File

@ -36,10 +36,11 @@ nv.models.lineChart = function() {
function chart(selection) { function chart(selection) {
selection.each(function(data) { selection.each(function(data) {
var container = d3.select(this);
var availableWidth = (width || parseInt(d3.select(this).style('width')) || 960) var availableWidth = (width || parseInt(container.style('width')) || 960)
- margin.left - margin.right, - margin.left - margin.right,
availableHeight = (height || parseInt(d3.select(this).style('height')) || 400) availableHeight = (height || parseInt(container.style('height')) || 400)
- margin.top - margin.bottom; - margin.top - margin.bottom;
@ -51,7 +52,7 @@ nv.models.lineChart = function() {
}).filter(function(d,i) { return !data[i].disabled })); }).filter(function(d,i) { return !data[i].disabled }));
var wrap = d3.select(this).selectAll('g.wrap.lineWithLegend').data([data]); var wrap = container.selectAll('g.wrap.lineWithLegend').data([data]);
var gEnter = wrap.enter().append('g').attr('class', 'wrap nvd3 lineWithLegend').append('g'); var gEnter = wrap.enter().append('g').attr('class', 'wrap nvd3 lineWithLegend').append('g');
gEnter.append('g').attr('class', 'x axis'); gEnter.append('g').attr('class', 'x axis');
@ -138,7 +139,7 @@ nv.models.lineChart = function() {
e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top]; e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top];
dispatch.tooltipShow(e); dispatch.tooltipShow(e);
}); });
dispatch.on('tooltipShow', function(e) { showTooltip(e, this) } ); // TODO: maybe merge with above? dispatch.on('tooltipShow', function(e) { showTooltip(e, container[0][0]) } ); // TODO: maybe merge with above?
lines.dispatch.on('elementMouseout.tooltip', function(e) { lines.dispatch.on('elementMouseout.tooltip', function(e) {
dispatch.tooltipHide(e); dispatch.tooltipHide(e);