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

Change scale show properties to display and update tests

Browse Source
This commit is contained in:
Evert Timberg 2015-11-24 19:18:15 -05:00
parent cf1f772157
commit a90aac7b26
8 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/core.scale.js
View File

@ -10,7 +10,7 @@
// grid line settings // grid line settings
gridLines: { gridLines: {
show: true, display: true,
color: "rgba(0, 0, 0, 0.1)", color: "rgba(0, 0, 0, 0.1)",
lineWidth: 1, lineWidth: 1,
drawOnChartArea: true, drawOnChartArea: true,
@ -31,7 +31,7 @@
labelString: '', labelString: '',
// display property // display property
show: false, display: false,
}, },
// label settings // label settings
@ -46,7 +46,7 @@
mirror: false, mirror: false,
padding: 10, padding: 10,
reverse: false, reverse: false,
show: true, display: true,
callback: function(value) { callback: function(value) {
return '' + value; return '' + value;
}, },
@ -231,18 +231,18 @@
if (this.isHorizontal()) { if (this.isHorizontal()) {
this.minSize.width = this.maxWidth; // fill all the width this.minSize.width = this.maxWidth; // fill all the width
} else { } else {
this.minSize.width = this.options.gridLines.show && this.options.display ? 10 : 0; this.minSize.width = this.options.gridLines.display && this.options.display ? 10 : 0;
} }
// height // height
if (this.isHorizontal()) { if (this.isHorizontal()) {
this.minSize.height = this.options.gridLines.show && this.options.display ? 10 : 0; this.minSize.height = this.options.gridLines.display && this.options.display ? 10 : 0;
} else { } else {
this.minSize.height = this.maxHeight; // fill all the height this.minSize.height = this.maxHeight; // fill all the height
} }
// Are we showing a title for the scale? // Are we showing a title for the scale?
if (this.options.scaleLabel.show) { if (this.options.scaleLabel.display) {
if (this.isHorizontal()) { if (this.isHorizontal()) {
this.minSize.height += (this.options.scaleLabel.fontSize * 1.5); this.minSize.height += (this.options.scaleLabel.fontSize * 1.5);
} else { } else {
@ -250,7 +250,7 @@
} }
} }
if (this.options.ticks.show && this.options.display) { if (this.options.ticks.display && this.options.display) {
// Don't bother fitting the ticks if we are not showing them // Don't bother fitting the ticks if we are not showing them
var labelFont = helpers.fontString(this.options.ticks.fontSize, var labelFont = helpers.fontString(this.options.ticks.fontSize,
this.options.ticks.fontStyle, this.options.ticks.fontFamily); this.options.ticks.fontStyle, this.options.ticks.fontFamily);
@ -411,7 +411,7 @@
var xLineValue = this.getPixelForTick(index); // xvalues for grid lines var xLineValue = this.getPixelForTick(index); // xvalues for grid lines
var xLabelValue = this.getPixelForTick(index, this.options.gridLines.offsetGridLines); // x values for ticks (need to consider offsetLabel option) var xLabelValue = this.getPixelForTick(index, this.options.gridLines.offsetGridLines); // x values for ticks (need to consider offsetLabel option)
if (this.options.gridLines.show) { if (this.options.gridLines.display) {
if (index === (typeof this.zeroLineIndex !== 'undefined' ? this.zeroLineIndex : 0)) { if (index === (typeof this.zeroLineIndex !== 'undefined' ? this.zeroLineIndex : 0)) {
// Draw the first index specially // Draw the first index specially
this.ctx.lineWidth = this.options.gridLines.zeroLineWidth; this.ctx.lineWidth = this.options.gridLines.zeroLineWidth;
@ -443,7 +443,7 @@
this.ctx.stroke(); this.ctx.stroke();
} }
if (this.options.ticks.show) { if (this.options.ticks.display) {
this.ctx.save(); this.ctx.save();
this.ctx.translate(xLabelValue, (isRotated) ? this.top + 12 : this.options.position === "top" ? this.bottom - 10 : this.top + 10); this.ctx.translate(xLabelValue, (isRotated) ? this.top + 12 : this.options.position === "top" ? this.bottom - 10 : this.top + 10);
this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1); this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1);
@ -455,7 +455,7 @@
} }
}, this); }, this);
if (this.options.scaleLabel.show) { if (this.options.scaleLabel.display) {
// Draw the scale label // Draw the scale label
this.ctx.textAlign = "center"; this.ctx.textAlign = "center";
this.ctx.textBaseline = 'middle'; this.ctx.textBaseline = 'middle';
@ -481,7 +481,7 @@
var yLineValue = this.getPixelForTick(index); // xvalues for grid lines var yLineValue = this.getPixelForTick(index); // xvalues for grid lines
if (this.options.gridLines.show) { if (this.options.gridLines.display) {
if (index === (typeof this.zeroLineIndex !== 'undefined' ? this.zeroLineIndex : 0)) { if (index === (typeof this.zeroLineIndex !== 'undefined' ? this.zeroLineIndex : 0)) {
// Draw the first index specially // Draw the first index specially
this.ctx.lineWidth = this.options.gridLines.zeroLineWidth; this.ctx.lineWidth = this.options.gridLines.zeroLineWidth;
@ -513,7 +513,7 @@
this.ctx.stroke(); this.ctx.stroke();
} }
if (this.options.ticks.show) { if (this.options.ticks.display) {
var xLabelValue; var xLabelValue;
var yLabelValue = this.getPixelForTick(index, this.options.gridLines.offsetGridLines); // x values for ticks (need to consider offsetLabel option) var yLabelValue = this.getPixelForTick(index, this.options.gridLines.offsetGridLines); // x values for ticks (need to consider offsetLabel option)
@ -548,7 +548,7 @@
} }
}, this); }, this);
if (this.options.scaleLabel.show) { if (this.options.scaleLabel.display) {
// Draw the scale label // Draw the scale label
scaleLabelX = this.options.position == 'left' ? this.left + (this.options.scaleLabel.fontSize / 2) : this.right - (this.options.scaleLabel.fontSize / 2); scaleLabelX = this.options.position == 'left' ? this.left + (this.options.scaleLabel.fontSize / 2) : this.right - (this.options.scaleLabel.fontSize / 2);
scaleLabelY = this.top + ((this.bottom - this.top) / 2); scaleLabelY = this.top + ((this.bottom - this.top) / 2);

8
src/scales/scale.radialLinear.js
View File

@ -14,7 +14,7 @@
position: "chartArea", position: "chartArea",
angleLines: { angleLines: {
show: true, display: true,
color: "rgba(0, 0, 0, 0.1)", color: "rgba(0, 0, 0, 0.1)",
lineWidth: 1 lineWidth: 1
}, },
@ -304,7 +304,7 @@
var yHeight = this.yCenter - yCenterOffset; var yHeight = this.yCenter - yCenterOffset;
// Draw circular lines around the scale // Draw circular lines around the scale
if (this.options.gridLines.show) { if (this.options.gridLines.display) {
ctx.strokeStyle = this.options.gridLines.color; ctx.strokeStyle = this.options.gridLines.color;
ctx.lineWidth = this.options.gridLines.lineWidth; ctx.lineWidth = this.options.gridLines.lineWidth;
@ -330,7 +330,7 @@
} }
} }
if (this.options.ticks.show) { if (this.options.ticks.display) {
ctx.font = helpers.fontString(this.options.ticks.fontSize, this.options.ticks.fontStyle, this.options.ticks.fontFamily); ctx.font = helpers.fontString(this.options.ticks.fontSize, this.options.ticks.fontStyle, this.options.ticks.fontFamily);
if (this.options.ticks.showLabelBackdrop) { if (this.options.ticks.showLabelBackdrop) {
@ -357,7 +357,7 @@
ctx.strokeStyle = this.options.angleLines.color; ctx.strokeStyle = this.options.angleLines.color;
for (var i = this.getValueCount() - 1; i >= 0; i--) { for (var i = this.getValueCount() - 1; i >= 0; i--) {
if (this.options.angleLines.show) { if (this.options.angleLines.display) {
var outerPosition = this.getPointPosition(i, this.getDistanceFromCenterForValue(this.options.reverse ? this.min : this.max)); var outerPosition = this.getPointPosition(i, this.getDistanceFromCenterForValue(this.options.reverse ? this.min : this.max));
ctx.beginPath(); ctx.beginPath();
ctx.moveTo(this.xCenter, this.yCenter); ctx.moveTo(this.xCenter, this.yCenter);

12
test/core.helpers.tests.js
View File

@ -219,7 +219,7 @@ describe('Core helper tests', function() {
drawTicks: true, // draw ticks extending towards the label drawTicks: true, // draw ticks extending towards the label
lineWidth: 1, lineWidth: 1,
offsetGridLines: false, offsetGridLines: false,
show: true, display: true,
zeroLineColor: "rgba(0,0,0,0.25)", zeroLineColor: "rgba(0,0,0,0.25)",
zeroLineWidth: 1, zeroLineWidth: 1,
}, },
@ -230,7 +230,7 @@ describe('Core helper tests', function() {
fontSize: 12, fontSize: 12,
fontStyle: 'normal', fontStyle: 'normal',
labelString: '', labelString: '',
show: false, display: false,
}, },
ticks: { ticks: {
beginAtZero: false, beginAtZero: false,
@ -243,7 +243,7 @@ describe('Core helper tests', function() {
mirror: false, mirror: false,
padding: 10, padding: 10,
reverse: false, reverse: false,
show: true, display: true,
callback: merged.scales.yAxes[1].ticks.callback, // make it nicer, then check explicitly below callback: merged.scales.yAxes[1].ticks.callback, // make it nicer, then check explicitly below
}, },
type: 'linear' type: 'linear'
@ -256,7 +256,7 @@ describe('Core helper tests', function() {
drawTicks: true, // draw ticks extending towards the label drawTicks: true, // draw ticks extending towards the label
lineWidth: 1, lineWidth: 1,
offsetGridLines: false, offsetGridLines: false,
show: true, display: true,
zeroLineColor: "rgba(0,0,0,0.25)", zeroLineColor: "rgba(0,0,0,0.25)",
zeroLineWidth: 1, zeroLineWidth: 1,
}, },
@ -267,7 +267,7 @@ describe('Core helper tests', function() {
fontSize: 12, fontSize: 12,
fontStyle: 'normal', fontStyle: 'normal',
labelString: '', labelString: '',
show: false, display: false,
}, },
ticks: { ticks: {
beginAtZero: false, beginAtZero: false,
@ -280,7 +280,7 @@ describe('Core helper tests', function() {
mirror: false, mirror: false,
padding: 10, padding: 10,
reverse: false, reverse: false,
show: true, display: true,
callback: merged.scales.yAxes[2].ticks.callback, // make it nicer, then check explicitly below callback: merged.scales.yAxes[2].ticks.callback, // make it nicer, then check explicitly below
}, },
type: 'linear' type: 'linear'

6
test/scale.category.tests.js
View File

@ -18,7 +18,7 @@ describe('Category scale tests', function() {
drawTicks: true, // draw ticks extending towards the label drawTicks: true, // draw ticks extending towards the label
lineWidth: 1, lineWidth: 1,
offsetGridLines: false, offsetGridLines: false,
show: true, display: true,
zeroLineColor: "rgba(0,0,0,0.25)", zeroLineColor: "rgba(0,0,0,0.25)",
zeroLineWidth: 1, zeroLineWidth: 1,
}, },
@ -29,7 +29,7 @@ describe('Category scale tests', function() {
fontSize: 12, fontSize: 12,
fontStyle: 'normal', fontStyle: 'normal',
labelString: '', labelString: '',
show: false, display: false,
}, },
ticks: { ticks: {
beginAtZero: false, beginAtZero: false,
@ -42,7 +42,7 @@ describe('Category scale tests', function() {
mirror: false, mirror: false,
padding: 10, padding: 10,
reverse: false, reverse: false,
show: true, display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
} }
}); });

18
test/scale.linear.tests.js
View File

@ -17,7 +17,7 @@ describe('Linear Scale', function() {
drawTicks: true, // draw ticks extending towards the label drawTicks: true, // draw ticks extending towards the label
lineWidth: 1, lineWidth: 1,
offsetGridLines: false, offsetGridLines: false,
show: true, display: true,
zeroLineColor: "rgba(0,0,0,0.25)", zeroLineColor: "rgba(0,0,0,0.25)",
zeroLineWidth: 1, zeroLineWidth: 1,
}, },
@ -28,7 +28,7 @@ describe('Linear Scale', function() {
fontSize: 12, fontSize: 12,
fontStyle: 'normal', fontStyle: 'normal',
labelString: '', labelString: '',
show: false, display: false,
}, },
ticks: { ticks: {
beginAtZero: false, beginAtZero: false,
@ -41,7 +41,7 @@ describe('Linear Scale', function() {
mirror: false, mirror: false,
padding: 10, padding: 10,
reverse: false, reverse: false,
show: true, display: true,
callback: defaultConfig.ticks.callback, // make this work nicer, then check below callback: defaultConfig.ticks.callback, // make this work nicer, then check below
} }
}); });
@ -692,7 +692,7 @@ describe('Linear Scale', function() {
expect(verticalScale.paddingRight).toBe(0); expect(verticalScale.paddingRight).toBe(0);
// Extra size when scale label showing // Extra size when scale label showing
config.scaleLabel.show = true; config.scaleLabel.display = true;
minSize = verticalScale.update(100, 300); minSize = verticalScale.update(100, 300);
expect(minSize).toEqual({ expect(minSize).toEqual({
width: 58, width: 58,
@ -754,7 +754,7 @@ describe('Linear Scale', function() {
expect(horizontalScale.paddingRight).toBe(2); expect(horizontalScale.paddingRight).toBe(2);
// Extra size when scale label showing // Extra size when scale label showing
config.scaleLabel.show = true; config.scaleLabel.display = true;
minSize = horizontalScale.update(200, 300); minSize = horizontalScale.update(200, 300);
expect(minSize).toEqual({ expect(minSize).toEqual({
width: 200, width: 200,
@ -934,8 +934,8 @@ describe('Linear Scale', function() {
// Turn off some drawing // Turn off some drawing
config.gridLines.drawTicks = false; config.gridLines.drawTicks = false;
config.gridLines.drawOnChartArea = false; config.gridLines.drawOnChartArea = false;
config.ticks.show = false; config.ticks.display = false;
config.scaleLabel.show = true; config.scaleLabel.display = true;
config.scaleLabel.labelString = 'myLabel'; config.scaleLabel.labelString = 'myLabel';
mockContext.resetCalls(); mockContext.resetCalls();
@ -1435,8 +1435,8 @@ describe('Linear Scale', function() {
// Turn off some drawing // Turn off some drawing
config.gridLines.drawTicks = false; config.gridLines.drawTicks = false;
config.gridLines.drawOnChartArea = false; config.gridLines.drawOnChartArea = false;
config.ticks.show = false; config.ticks.display = false;
config.scaleLabel.show = true; config.scaleLabel.display = true;
mockContext.resetCalls(); mockContext.resetCalls();

6
test/scale.logarithmic.tests.js
View File

@ -16,7 +16,7 @@ describe('Logarithmic Scale tests', function() {
drawTicks: true, drawTicks: true,
lineWidth: 1, lineWidth: 1,
offsetGridLines: false, offsetGridLines: false,
show: true, display: true,
zeroLineColor: "rgba(0,0,0,0.25)", zeroLineColor: "rgba(0,0,0,0.25)",
zeroLineWidth: 1, zeroLineWidth: 1,
}, },
@ -27,7 +27,7 @@ describe('Logarithmic Scale tests', function() {
fontSize: 12, fontSize: 12,
fontStyle: 'normal', fontStyle: 'normal',
labelString: '', labelString: '',
show: false, display: false,
}, },
ticks: { ticks: {
beginAtZero: false, beginAtZero: false,
@ -40,7 +40,7 @@ describe('Logarithmic Scale tests', function() {
mirror: false, mirror: false,
padding: 10, padding: 10,
reverse: false, reverse: false,
show: true, display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
}, },
}); });

8
test/scale.radialLinear.tests.js
View File

@ -10,7 +10,7 @@ describe('Test the radial linear scale', function() {
var defaultConfig = Chart.scaleService.getScaleDefaults('radialLinear'); var defaultConfig = Chart.scaleService.getScaleDefaults('radialLinear');
expect(defaultConfig).toEqual({ expect(defaultConfig).toEqual({
angleLines: { angleLines: {
show: true, display: true,
color: "rgba(0, 0, 0, 0.1)", color: "rgba(0, 0, 0, 0.1)",
lineWidth: 1 lineWidth: 1
}, },
@ -22,7 +22,7 @@ describe('Test the radial linear scale', function() {
drawTicks: true, drawTicks: true,
lineWidth: 1, lineWidth: 1,
offsetGridLines: false, offsetGridLines: false,
show: true, display: true,
zeroLineColor: "rgba(0,0,0,0.25)", zeroLineColor: "rgba(0,0,0,0.25)",
zeroLineWidth: 1, zeroLineWidth: 1,
}, },
@ -40,7 +40,7 @@ describe('Test the radial linear scale', function() {
fontSize: 12, fontSize: 12,
fontStyle: 'normal', fontStyle: 'normal',
labelString: '', labelString: '',
show: false, display: false,
}, },
ticks: { ticks: {
backdropColor: "rgba(255,255,255,0.75)", backdropColor: "rgba(255,255,255,0.75)",
@ -57,7 +57,7 @@ describe('Test the radial linear scale', function() {
padding: 10, padding: 10,
reverse: false, reverse: false,
showLabelBackdrop: true, showLabelBackdrop: true,
show: true, display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
}, },

6
test/scale.time.tests.js
View File

@ -21,7 +21,7 @@ describe('Time scale tests', function() {
drawTicks: true, drawTicks: true,
lineWidth: 1, lineWidth: 1,
offsetGridLines: false, offsetGridLines: false,
show: true, display: true,
zeroLineColor: "rgba(0,0,0,0.25)", zeroLineColor: "rgba(0,0,0,0.25)",
zeroLineWidth: 1, zeroLineWidth: 1,
}, },
@ -32,7 +32,7 @@ describe('Time scale tests', function() {
fontSize: 12, fontSize: 12,
fontStyle: 'normal', fontStyle: 'normal',
labelString: '', labelString: '',
show: false, display: false,
}, },
ticks: { ticks: {
beginAtZero: false, beginAtZero: false,
@ -45,7 +45,7 @@ describe('Time scale tests', function() {
mirror: false, mirror: false,
padding: 10, padding: 10,
reverse: false, reverse: false,
show: true, display: true,
callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below callback: defaultConfig.ticks.callback, // make this nicer, then check explicitly below
}, },
time: { time: {