Add keyword spacing to eslint and update code

diff --git a/.eslintrc b/.eslintrc
index 4ba4ba5a098589f8e212693f220d3c966c6f1965..38916dfb02eac6f2e6a73c8b17d227c83f8ea088 100644 (file)
--- a/.eslintrc
+++ b/.eslintrc
@@ -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

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index f996fa2b5eff3688e40e1c602afd5411d7138edb..0f74bcad6bfc621a0083ab8219f9cf02557bbe4a 100644 (file)
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -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]);
                                        }
                                }

diff --git a/src/core/core.legend.js b/src/core/core.legend.js
index 7c78dc1cecbb7dcfbce8be630db279a8f59aeb3d..369b549fa62b458ee3170ffdb7eedc36c245b779 100644 (file)
--- a/src/core/core.legend.js
+++ b/src/core/core.legend.js
@@ -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();
                        }
                },

diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js
index 2535deaa69effacf92dc3860b82bc29031c2c640..2d4f323fdd97cc30cd358ede9ce502c71e6c45cd 100644 (file)
--- a/src/scales/scale.logarithmic.js
+++ b/src/scales/scale.logarithmic.js
@@ -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)));