Allow scale labels to override category labels, if set

Fixes chartjs#3275
AlbinoDrought · Dec 21, 2016 · 014952b · 014952b
1 parent ecc35c5
commit 014952b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
@@ -16,7 +16,8 @@ module.exports = function(Chart) {
 		*/
 		getLabels: function() {
 			var data = this.chart.data;
-			return (this.isHorizontal() ? data.xLabels : data.yLabels) || data.labels;
+
+			return this.options.labels || (this.isHorizontal() ? data.xLabels : data.yLabels) || data.labels;
 		},
 		// Implement this so that
 		determineDataLimits: function() {