From: etimberg <evert.timberg@gmail.com>
Date: Sat, 31 Oct 2015 15:01:40 +0000 (-0400)
Subject: suggestedMin and suggestedMax options for scales
X-Git-Tag: 2.0.0-beta1~37^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3aaa3e27f38fa8fce0523377de06f31ce720bef0;p=thirdparty%2FChart.js.git

suggestedMin and suggestedMax options for scales
---

diff --git a/samples/line.html b/samples/line.html
index e83f488fa..45cd9229c 100644
--- a/samples/line.html
+++ b/samples/line.html
@@ -30,7 +30,8 @@
     </div>
     <script>
         var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
+            return Math.round(Math.random() * 100);
+            //return 0;
         };
         var randomColorFactor = function() {
             return Math.round(Math.random() * 255);
@@ -101,6 +102,10 @@
                         scaleLabel: {
                             show: true,
                             labelString: 'Value'
+                        },
+                        ticks: {
+                            suggestedMin: -10,
+                            suggestedMax: 250,
                         }
                     }]
                 }
diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js
index 78c02a2ea..e4cc4fd34 100644
--- a/src/scales/scale.linear.js
+++ b/src/scales/scale.linear.js
@@ -138,7 +138,15 @@
 					// move the botttom down to 0
 					this.min = 0;
 				}
-			} 
+			}
+
+			if (this.options.ticks.suggestedMin) {
+				this.min = Math.min(this.min, this.options.ticks.suggestedMin);
+			}
+
+			if (this.options.ticks.suggestedMax) {
+				this.max = Math.max(this.max, this.options.ticks.suggestedMax);
+			}
 
 			if (this.min === this.max) {
 				this.min--;