From: Zach Panzarino <zachary@panzarino.com>
Date: Wed, 14 Sep 2016 18:12:23 +0000 (+0000)
Subject: Add keyword spacing to eslint and update code
X-Git-Tag: v2.3.0-rc.1~1^2~6^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11739234a4b218d65a008c1afcb72c8ee42556a9;p=thirdparty%2FChart.js.git

Add keyword spacing to eslint and update code
---

diff --git a/.eslintrc b/.eslintrc
index 4ba4ba5a0..38916dfb0 100644
--- 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 f996fa2b5..0f74bcad6 100644
--- 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 7c78dc1ce..369b549fa 100644
--- 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 2535deaa6..2d4f323fd 100644
--- 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)));