Merge branch 'MDL-59790-master' of git://github.com/lameze/moodle

moodle · Aug 23, 2017 · 8839739 · 8839739
2 parents fc7467e + b45ca55
commit 8839739
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/amd/build/chart_output_chartjs.min.js b/lib/amd/build/chart_output_chartjs.min.js
diff --git a/lib/amd/src/chart_output_chartjs.js b/lib/amd/src/chart_output_chartjs.js
@@ -293,11 +293,19 @@ define([
         var tooltipData = chartData[tooltipItem.index];
 
         // Build default tooltip.
-        var tooltip = this._cleanData(serieLabel) + ': ' + tooltipData;
+        var tooltip = [];
+
+        // Pie and doughnut charts does not have axis.
+        if (tooltipItem.xLabel == '' && tooltipItem.yLabel == '') {
+            var chartLabels = this._cleanData(this._chart.getLabels());
+            tooltip.push(chartLabels[tooltipItem.index]);
+        }
 
         // Add series labels to the tooltip if any.
         if (serieLabels !== null) {
-            tooltip = this._cleanData(serieLabels[tooltipItem.index]);
+            tooltip.push(this._cleanData(serieLabels[tooltipItem.index]));
+        } else {
+            tooltip.push(this._cleanData(serieLabel) + ': ' + tooltipData);
         }
 
         return tooltip;