Merge pull request #38 from dnwick/master

Added Mac fix for tooltip

Author: dnwick

charts/chart.util.js

@@ -167,7 +167,6 @@ function bindTooltip(div,markType,eventObj, config, metaData, keyList){
 
         if (item != null && item.status != "exit" && item.mark.marktype == markType) {
             var canvas = $(".marks")[0];
-
             if($("#wrapper #tip").length) {
                 $tip.remove();
             }
@@ -206,6 +205,13 @@ function bindTooltip(div,markType,eventObj, config, metaData, keyList){
 
             var canvasWidth = canvas.width;
             var canvasHeight = canvas.height;
+
+            var el = $('.marks[style*="width"]');
+
+            if(el.length > 0){
+                canvasWidth = parseFloat($(".marks")[0].style.width);
+                canvasHeight = parseFloat($(".marks")[0].style.height);
+            }
             var dynamicWidth = $tip.width();
             var dynamicHeight = $tip.height();
 

dist/VizGrammar.js

@@ -1753,6 +1753,9 @@ function bindTooltip(div,markType,eventObj, config, metaData, keyList){
 
         if (item != null && item.status != "exit" && item.mark.marktype == markType) {
             var canvas = $(".marks")[0];
+            if($("#wrapper #tip").length) {
+                $tip.remove();
+            }
 
             $(div).wrap( "<div id='wrapper' style='position: relative'></div>" );
 
@@ -1788,6 +1791,13 @@ function bindTooltip(div,markType,eventObj, config, metaData, keyList){
 
             var canvasWidth = canvas.width;
             var canvasHeight = canvas.height;
+
+            var el = $('.marks[style*="width"]');
+
+            if(el.length > 0){
+                canvasWidth = parseFloat($(".marks")[0].style.width);
+                canvasHeight = parseFloat($(".marks")[0].style.height);
+            }
             var dynamicWidth = $tip.width();
             var dynamicHeight = $tip.height();