Merge remote-tracking branch 'origin/master'

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
         }

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