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

Add keyword spacing to eslint and update code

Browse Source
This commit is contained in:
Zach Panzarino 2016-09-14 18:12:23 +00:00
parent 2d2f475a7a
commit 11739234a4
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc
View File

@ -136,6 +136,7 @@ rules:
computed-property-spacing: [2, never]
consistent-this: [2, me]
eol-last: 2
func-call-spacing: [2, never]
func-names: [2, never]
func-style: 0
id-length: 0
@ -143,6 +144,7 @@ rules:
indent: [2, tab]
jsx-quotes: 0
key-spacing: 2
keyword-spacing: 2
linebreak-style: [2, unix]
lines-around-comment: 0
max-depth: 0

4
src/core/core.controller.js
View File

@ -415,7 +415,7 @@ module.exports = function(Chart) {
if (me.isDatasetVisible(datasetIndex)) {
var meta = me.getDatasetMeta(datasetIndex),
element = meta.data[found._index];
if(element && !element._view.skip) {
if (element && !element._view.skip) {
elementsArray.push(element);
}
}
@ -454,7 +454,7 @@ module.exports = function(Chart) {
var index = helpers.findIndex(meta.data, function(it) {
return found._model.x === it._model.x;
});
if(index !== -1 && !meta.data[index]._view.skip) {
if (index !== -1 && !meta.data[index]._view.skip) {
elementsArray.push(meta.data[index]);
}
}

2
src/core/core.legend.js
View File

@ -151,7 +151,7 @@ module.exports = function(Chart) {
buildLabels: function() {
var me = this;
me.legendItems = me.options.labels.generateLabels.call(me, me.chart);
if(me.options.reverse) {
if (me.options.reverse) {
me.legendItems.reverse();
}
},

10
src/scales/scale.logarithmic.js
View File

@ -100,7 +100,7 @@ module.exports = function(Chart) {
me.max = value;
}
if(value !== 0 && (me.minNotZero === null || value < me.minNotZero)) {
if (value !== 0 && (me.minNotZero === null || value < me.minNotZero)) {
me.minNotZero = value;
}
});
@ -144,7 +144,7 @@ module.exports = function(Chart) {
var exp;
var significand;
if(tickVal === 0) {
if (tickVal === 0) {
exp = Math.floor(helpers.log10(me.minNotZero));
significand = Math.round(me.minNotZero / Math.pow(10, exp));
} else {
@ -221,11 +221,11 @@ module.exports = function(Chart) {
} else {
// Bottom - top since pixels increase downard on a screen
innerDimension = me.height - (paddingTop + paddingBottom);
if(start === 0 && !tickOpts.reverse) {
if (start === 0 && !tickOpts.reverse) {
range = helpers.log10(me.end) - helpers.log10(me.minNotZero);
if (newVal === start) {
pixel = me.bottom - paddingBottom;
} else if(newVal === me.minNotZero) {
} else if (newVal === me.minNotZero) {
pixel = me.bottom - paddingBottom - innerDimension * 0.02;
} else {
pixel = me.bottom - paddingBottom - innerDimension * 0.02 - (innerDimension * 0.98/ range * (helpers.log10(newVal)-helpers.log10(me.minNotZero)));
@ -234,7 +234,7 @@ module.exports = function(Chart) {
range = helpers.log10(me.start) - helpers.log10(me.minNotZero);
if (newVal === me.end) {
pixel = me.top + paddingTop;
} else if(newVal === me.minNotZero) {
} else if (newVal === me.minNotZero) {
pixel = me.top + paddingTop + innerDimension * 0.02;
} else {
pixel = me.top + paddingTop + innerDimension * 0.02 + (innerDimension * 0.98/ range * (helpers.log10(newVal)-helpers.log10(me.minNotZero)));