]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Fix the y scales that were missed in the previous check in
authorEvert Timberg <evert.timberg@gmail.com>
Sun, 24 May 2015 01:49:01 +0000 (21:49 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Sun, 24 May 2015 01:49:01 +0000 (21:49 -0400)
samples/bar-multi-axis.html
samples/line-multi-axis.html
samples/scatter-multi-axis.html
src/Chart.Bar.js
src/Chart.Line.js
src/Chart.Scatter.js

index 7a54ae0d7cb1c016e35bca1fef154ad5ff5ca41e..6ae6eca459055a0e06f535853b47ea995ff65b66 100644 (file)
@@ -52,7 +52,7 @@
                 scales: {
                     yAxes: [{
                         scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                        show: true,
+                        display: true,
                         position: "left",
                         id: "y-axis-1",
                 
@@ -83,7 +83,7 @@
                         }
                     }, {
                         scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                        show: true,
+                        display: true,
                         position: "right",
                         id: "y-axis-2",
                 
index 143bc9abc2112c1261ed5ccb3608ad6c304153d1..bb4b58a7791c9cf27ad6e7425b980f6a90848477 100644 (file)
@@ -61,7 +61,7 @@
                     }],
                     yAxes: [{
                         scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                        show: true,
+                        display: true,
                         position: "left",
                         id: "y-axis-1",
                 
@@ -92,7 +92,7 @@
                         }
                     }, {
                         scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                        show: true,
+                        display: true,
                         position: "right",
                         id: "y-axis-2",
                 
index 33f00512559e946d2df9a407aa5cd2b2c28847ee..7a85feb47958b3e98c2ea3229834ac964233c202 100644 (file)
                        }],
                        yAxes: [{
                                scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                               show: true,
+                               display: true,
                                position: "left",
                                id: "y-axis-1",
                        
                                }
                            }, {
                                scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                               show: true,
+                               display: true,
                                position: "right",
                                id: "y-axis-2",
                        
index 4d737ddb4b2526f1069100dc82063b60c16ce4a6..6cc891b4ac3e5959d667570381767214c143b23c 100644 (file)
@@ -43,7 +43,7 @@
             }],
             yAxes: [{
                 scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                show: true,
+                display: true,
                 position: "left",
                 id: "y-axis-1",
         
index 3663843671a9eeab7b6a4acace69cc07a0a8a728..ecc87e97f30b3e1230ba9da9c60ef3a1213c5f58 100644 (file)
@@ -43,7 +43,7 @@
             }],
             yAxes: [{
                 scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                show: true,
+                display: true,
                 position: "left",
                 id: "y-axis-1",
         
index 0211c74fc4ceff00d84f520e894a365dcb57cd03..240160b7ae7bc36c50eca919b504247fac512163 100644 (file)
@@ -42,7 +42,7 @@
             }],
             yAxes: [{
                 scaleType: "linear", // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                show: true,
+                display: true,
                 position: "left",
                 id: "y-axis-1",