archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Clean up some unused config options. Renamed 'show' to 'display' for scales since that was clearer and maintains backwards compatibility.

Browse Source
This commit is contained in:
Evert Timberg 2015-05-23 21:44:50 -04:00
parent 73b579c962
commit d4e7765a50
7 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/bar-multi-axis.html
View File

@ -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

2
samples/line-multi-axis.html
View File

@ -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

2
samples/scatter-multi-axis.html
View File

@ -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

4
src/Chart.Bar.js
View File

@ -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

4
src/Chart.Line.js
View File

@ -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

6
src/Chart.Scale.js
View File

@ -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;

4
src/Chart.Scatter.js
View File

@ -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