From: Derek Perkins <derek@derekperkins.com>
Date: Sat, 12 Dec 2015 01:52:26 +0000 (-0700)
Subject: Merge pull request #1750 from nnnick/v2.0-legend
X-Git-Tag: 2.0.0-beta2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4add69432fd60b55e288e8803678ae076f14fb2a;p=thirdparty%2FChart.js.git

Merge pull request #1750 from nnnick/v2.0-legend

Legend and Title Support
---

4add69432fd60b55e288e8803678ae076f14fb2a
diff --cc src/core/core.scale.js
index aea41ea49,a4f0ca5ae..6f15033e6
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@@ -317,8 -325,11 +323,11 @@@
  
  		// Shared Methods
  		isHorizontal: function() {
 -			return this.options.position == "top" || this.options.position == "bottom";
 +			return this.options.position === "top" || this.options.position === "bottom";
  		},
+ 		isFullWidth: function() {
+ 			return (this.options.fullWidth);
+ 		},
  
  		// Get the correct value. NaN bad inputs, If the value type is object get the x or y based on whether we are horizontal or not
  		getRightValue: function getRightValue(rawValue) {