From 040f0f3e7cff924fad5b714216649d972e4d67d3 Mon Sep 17 00:00:00 2001 From: Colin Eberhardt Date: Wed, 7 Oct 2015 06:40:17 +0100 Subject: [PATCH] relaxed the eqeqeq rule to permit 'foo != null' --- .eslintrc | 2 +- src/Layout.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.eslintrc b/.eslintrc index e379dfe7..34a6589b 100644 --- a/.eslintrc +++ b/.eslintrc @@ -54,7 +54,7 @@ "default-case": 0, "dot-notation": 2, "dot-location": 0, - "eqeqeq": 2, + "eqeqeq": [2, "allow-null"], "guard-for-in": 0, "no-alert": 2, "no-caller": 2, diff --git a/src/Layout.js b/src/Layout.js index 1ddec262..d37a47f2 100755 --- a/src/Layout.js +++ b/src/Layout.js @@ -112,7 +112,7 @@ var computeLayout = (function() { case 'column-reverse': value = node.style.marginBottom; break; } - if (value !== null && typeof value !== 'undefined') { + if (typeof value !== 'undefined') { return value; } @@ -136,7 +136,7 @@ var computeLayout = (function() { case 'column-reverse': value = node.style.marginTop; break; } - if (value !== null && typeof value !== 'undefined') { + if (value != null) { return value; } @@ -161,7 +161,7 @@ var computeLayout = (function() { case 'column-reverse': value = node.style.paddingBottom; break; } - if (value !== null && value >= 0) { + if (value != null && value >= 0) { return value; } @@ -186,7 +186,7 @@ var computeLayout = (function() { case 'column-reverse': value = node.style.paddingTop; break; } - if (value !== null && value >= 0) { + if (value != null && value >= 0) { return value; } @@ -211,7 +211,7 @@ var computeLayout = (function() { case 'column-reverse': value = node.style.borderBottomWidth; break; } - if (value !== null && value >= 0) { + if (value != null && value >= 0) { return value; } @@ -236,7 +236,7 @@ var computeLayout = (function() { case 'column-reverse': value = node.style.borderTopWidth; break; } - if (value !== null && value >= 0) { + if (value != null && value >= 0) { return value; }