From ba4fd1bda1afc3b7ba4e0e609e045577612ce453 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 26 Dec 2013 09:41:57 +0530
Subject: [PATCH] Fix chart tooltips

---
 js/chart.js     | 17 +++++++++++++++++
 js/tbl_chart.js |  7 +------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/js/chart.js b/js/chart.js
index 99944710c0..ac7874f17b 100644
--- a/js/chart.js
+++ b/js/chart.js
@@ -297,6 +297,11 @@ JQPlotLineChart.prototype.populateOptions = function (dataTable, options) {
                 labelRenderer : $.jqplot.CanvasAxisLabelRenderer
             }
         },
+        highlighter: {
+            show: true,
+            tooltipAxes: 'y',
+            formatString:'%d'
+        },
         series : []
     };
     $.extend(true, optional, options);
@@ -386,6 +391,11 @@ JQPlotScatterChart.prototype.populateOptions = function (dataTable, options) {
                 labelRenderer : $.jqplot.CanvasAxisLabelRenderer
             }
         },
+        highlighter: {
+            show: true,
+            tooltipAxes: 'xy',
+            formatString:'%d, %d'
+        },
         series : []
     };
     for (var i = 1; i < columns.length; i++) {
@@ -567,6 +577,11 @@ JQPlotBarChart.prototype.populateOptions = function (dataTable, options) {
                 labelRenderer : $.jqplot.CanvasAxisLabelRenderer
             }
         },
+        highlighter: {
+            show: true,
+            tooltipAxes: 'x',
+            formatString:'%d'
+        },
         series : [],
         seriesDefaults : {
             fillToZero : true
@@ -614,6 +629,8 @@ JQPlotPieChart.prototype.constructor = JQPlotPieChart;
 JQPlotPieChart.prototype.populateOptions = function (dataTable, options) {
     var optional = {
         highlighter: {
+            show: true,
+            tooltipAxes: 'xy',
             formatString:'%s, %d',
             useAxesFormatters: false
         }
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index 07f15f8a0a..560316dcf3 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -53,12 +53,7 @@ function PMA_queryChart(data, columnNames, settings) {
                 label : settings.yaxisLabel
             }
         },
-        stackSeries : settings.stackSeries,
-        highlighter: {
-            show: true,
-            showTooltip: true,
-            tooltipAxes: 'xy'
-        }
+        stackSeries : settings.stackSeries
     };
 
     // create the chart