Clean up some unused config options. Renamed 'show' to 'display' for scales since...

diff --git a/samples/bar-multi-axis.html b/samples/bar-multi-axis.html
index 4a7ccb848928958e517216844a6ad268c3a71c7f..7a54ae0d7cb1c016e35bca1fef154ad5ff5ca41e 100644 (file)
--- a/samples/bar-multi-axis.html
+++ b/samples/bar-multi-axis.html
@@ -54,7 +54,6 @@
                         scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                         show: true,
                         position: "left",
-                        horizontal: false, 
                         id: "y-axis-1",
                 
                         // grid line settings
@@ -86,7 +85,6 @@
                         scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                         show: true,
                         position: "right",
-                        horizontal: false, 
                         id: "y-axis-2",
                 
                         // grid line settings

diff --git a/samples/line-multi-axis.html b/samples/line-multi-axis.html
index d1f9e61959fb62c38f6ef099ff8fda8fe4958118..143bc9abc2112c1261ed5ccb3608ad6c304153d1 100644 (file)
--- a/samples/line-multi-axis.html
+++ b/samples/line-multi-axis.html
@@ -63,7 +63,6 @@
                         scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                         show: true,
                         position: "left",
-                        horizontal: false, 
                         id: "y-axis-1",
                 
                         // grid line settings
@@ -95,7 +94,6 @@
                         scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                         show: true,
                         position: "right",
-                        horizontal: false, 
                         id: "y-axis-2",
                 
                         // grid line settings

diff --git a/samples/scatter-multi-axis.html b/samples/scatter-multi-axis.html
index a7ca3f96e9682262d7d29429c0a88217cc36b7dd..33f00512559e946d2df9a407aa5cd2b2c28847ee 100644 (file)
--- a/samples/scatter-multi-axis.html
+++ b/samples/scatter-multi-axis.html
@@ -106,7 +106,6 @@
                                scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                                show: true,
                                position: "left",
-                               horizontal: false, 
                                id: "y-axis-1",
                        
                                // grid line settings
@@ -138,7 +137,6 @@
                                scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                                show: true,
                                position: "right",
-                               horizontal: false, 
                                id: "y-axis-2",
                        
                                // grid line settings

diff --git a/src/Chart.Bar.js b/src/Chart.Bar.js
index a7d3f0e98f7507a19a3636f6704198128ec83d6b..4d737ddb4b2526f1069100dc82063b60c16ce4a6 100644 (file)
--- a/src/Chart.Bar.js
+++ b/src/Chart.Bar.js
@@ -10,9 +10,8 @@
         scales: {
             xAxes: [{
                 scaleType: "dataset", // scatter should not use a dataset axis
-                show: true,
+                display: true,
                 position: "bottom",
-                horizontal: true,
                 id: "x-axis-1", // need an ID so datasets can reference the scale
                 
                 // grid line settings
@@ -46,7 +45,6 @@
                 scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                 show: true,
                 position: "left",
-                horizontal: false, 
                 id: "y-axis-1",
         
                 // grid line settings

diff --git a/src/Chart.Line.js b/src/Chart.Line.js
index ed3eae22554addb4e3be516e9dd4433f78f1816a..3663843671a9eeab7b6a4acace69cc07a0a8a728 100644 (file)
--- a/src/Chart.Line.js
+++ b/src/Chart.Line.js
@@ -10,9 +10,8 @@
         scales: {
             xAxes: [{
                 scaleType: "dataset", // scatter should not use a dataset axis
-                show: true,
+                display: true,
                 position: "bottom",
-                horizontal: true,
                 id: "x-axis-1", // need an ID so datasets can reference the scale
                 
                 // grid line settings
@@ -46,7 +45,6 @@
                 scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                 show: true,
                 position: "left",
-                horizontal: false, 
                 id: "y-axis-1",
         
                 // grid line settings

diff --git a/src/Chart.Scale.js b/src/Chart.Scale.js
index 2809287702f3437cbfec4430251c19ebe8470679..7d6436c757b68d0a18020bb9b364251602678e43 100644 (file)
--- a/src/Chart.Scale.js
+++ b/src/Chart.Scale.js
@@ -460,7 +460,7 @@
                // Actualy draw the scale on the canvas
                // @param {rectangle} chartArea : the area of the chart to draw full grid lines on
                draw: function(chartArea) {
-                       if (this.options.show) {
+                       if (this.options.display) {
                                
                                var setContextLineSettings;
                                var hasZero;
@@ -646,7 +646,7 @@
 
             this.labelRotation = 0;
 
-            if (this.options.show) {
+            if (this.options.display) {
                 var originalLabelWidth = helpers.longestText(this.ctx, labelFont, this.labels);
                 var cosRotation;
                 var sinRotation;
@@ -726,7 +726,7 @@
                // Actualy draw the scale on the canvas
                // @param {rectangle} chartArea : the area of the chart to draw full grid lines on
                draw: function(chartArea) {
-                       if (this.options.show) {
+                       if (this.options.display) {
                                
                                var setContextLineSettings;
                                

diff --git a/src/Chart.Scatter.js b/src/Chart.Scatter.js
index 127b4294e832f52a12d87dd2448768a5a0c306ac..0211c74fc4ceff00d84f520e894a365dcb57cd03 100644 (file)
--- a/src/Chart.Scatter.js
+++ b/src/Chart.Scatter.js
@@ -10,9 +10,8 @@
         scales: {
             xAxes: [{
                 scaleType: "linear", // scatter should not use a dataset axis
-                show: true,
+                display: true,
                 position: "bottom",
-                horizontal: true,
                 id: "x-axis-1", // need an ID so datasets can reference the scale
                 
                 // grid line settings
@@ -45,7 +44,6 @@
                 scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
                 show: true,
                 position: "left",
-                horizontal: false, 
                 id: "y-axis-1",
         
                 // grid line settings