vitalif-js
/
dimple
mirror of https://github.com/vitalif/dimple
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #49 from vintasoftware/tooltip-position 

Tooltip fixes
master
John Kiernander 2014-02-14 09:26:01 +00:00
parent a353e5894d 9ff9e64237
commit 2917511666
4 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/objects/plot/area.js
View File

@ -441,7 +441,7 @@
.style("opacity", 0.95);
// Shift the ring margin left or right depending on whether it will overlap the edge
overlap = cx + r + textMargin + popupMargin + w > parseFloat(chart.svg.attr("width"));
overlap = cx + r + textMargin + popupMargin + w > parseFloat(chart.svg.node().getBBox().width);
// Translate the shapes to the x position of the bubble (the x position of the shapes is handled)
t.attr("transform", "translate(" +

35
src/objects/plot/bar.js
View File

@ -126,7 +126,10 @@
yRunning = 0,
// The maximum bounds of the text elements
w = 0,
h = 0;
h = 0,
// Values to shift the popup
translateX,
translateY;
if (chart._tooltipGroup !== null && chart._tooltipGroup !== undefined) {
chart._tooltipGroup.remove();
@ -264,29 +267,31 @@
.style("opacity", 0.95);
// Shift the popup around to avoid overlapping the svg edge
if (x + width + textMargin + popupMargin + w < parseFloat(chart.svg.attr("width"))) {
if (x + width + textMargin + popupMargin + w < parseFloat(chart.svg.node().getBBox().width)) {
// Draw centre right
t.attr("transform", "translate(" +
(x + width + textMargin + popupMargin) + " , " +
(y + (height / 2) - ((yRunning - (h - textMargin)) / 2)) +
")");
translateX = (x + width + textMargin + popupMargin);
translateY = (y + (height / 2) - ((yRunning - (h - textMargin)) / 2));
t.attr("transform", "translate(" + translateX + " , " + translateY + ")");
} else if (x - (textMargin + popupMargin + w) > 0) {
// Draw centre left
t.attr("transform", "translate(" +
(x - (textMargin + popupMargin + w)) + " , " +
(y + (height / 2) - ((yRunning - (h - textMargin)) / 2)) +
")");
} else if (y + height + yRunning + popupMargin + textMargin < parseFloat(chart.svg.attr("height"))) {
translateX = (x - (textMargin + popupMargin + w));
translateY = (y + (height / 2) - ((yRunning - (h - textMargin)) / 2));
t.attr("transform", "translate(" + translateX + " , " + translateY + ")");
} else if (y + height + yRunning + popupMargin + textMargin < parseFloat(chart.svg.node().getBBox().height)) {
// Draw centre below
translateX = (x + (width / 2) - (2 * textMargin + w) / 2);
translateY = (y + height + 2 * textMargin);
t.attr("transform", "translate(" +
(x + (width / 2) - (2 * textMargin + w) / 2) + " , " +
(y + height + 2 * textMargin) +
(translateX > 0 ? translateX : popupMargin) + " , " +
translateY +
")");
} else {
// Draw centre above
translateX = (x + (width / 2) - (2 * textMargin + w) / 2);
translateY = (y - yRunning - (h - textMargin));
t.attr("transform", "translate(" +
(x + (width / 2) - (2 * textMargin + w) / 2) + " , " +
(y - yRunning - (h - textMargin)) +
(translateX > 0 ? translateX : popupMargin) + " , " +
translateY +
")");
}
},

2
src/objects/plot/bubble.js
View File

@ -291,7 +291,7 @@
.style("opacity", 0.95);
// Shift the ring margin left or right depending on whether it will overlap the edge
overlap = cx + r + textMargin + popupMargin + w > parseFloat(chart.svg.attr("width"));
overlap = cx + r + textMargin + popupMargin + w > parseFloat(chart.svg.node().getBBox().width);
// Translate the shapes to the x position of the bubble (the x position of the shapes is handled)
t.attr("transform", "translate(" +

2
src/objects/plot/line.js
View File

@ -428,7 +428,7 @@
.style("opacity", 0.95);
// Shift the ring margin left or right depending on whether it will overlap the edge
overlap = cx + r + textMargin + popupMargin + w > parseFloat(chart.svg.attr("width"));
overlap = cx + r + textMargin + popupMargin + w > parseFloat(chart.svg.node().getBBox().width);
// Translate the shapes to the x position of the bubble (the x position of the shapes is handled)
t.attr("transform", "translate(" +