From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Sat, 13 Jun 2015 06:30:42 +0000 (-0600)
Subject: Category Scale display false fixes
X-Git-Tag: 2.0.0-alpha2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0486db1e74bb1bebeb5eb1b69d50df4b96cbc384;p=thirdparty%2FChart.js.git

Category Scale display false fixes
---

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index f20457c4a..c0e9ada5f 100644
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -146,7 +146,7 @@
 			}
 
 			// Height
-			if (this.isHorizontal()) {
+			if (this.isHorizontal() && this.options.display) {
 				var labelHeight = (Math.cos(helpers.toRadians(this.labelRotation)) * longestLabelWidth) + 1.5 * this.options.labels.fontSize;
 				minSize.height = Math.min(labelHeight, maxHeight);
 			} else if (this.options.display) {