Merge 466015b into c5b6c4f

SAP · Jan 15, 2019 · 56a1070 · 56a1070
2 parents c5b6c4f + 466015b
commit 56a1070
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -140,7 +140,7 @@ rules:
     space-infix-ops: 2
     spaced-comment: [0, 'always', { exceptions: ['-']}]
     strict: [2, 'global']
-    #use-isnan: 2
+    use-isnan: 2
     #valid-jsdoc: [2, { prefer: { 'return': 'returns'}}]
     #valid-typeof: 2
     wrap-iife: [2, 'any']
diff --git a/src/DatePicker/DatePicker.js b/src/DatePicker/DatePicker.js
@@ -114,12 +114,12 @@ export class DatePicker extends Component {
 
           //Checks if the input is actually numbers and follows the required form
           if (
-            (firstYearRange !== NaN ||
-              firstDateRange !== NaN ||
-              firstMonthRange !== NaN) &&
-            (secondYearRange !== NaN ||
-              secondDateRange !== NaN ||
-              secondMonthRange !== NaN) &&
+              (!isNaN(firstYearRange) ||
+              !isNaN(firstDateRange) ||
+              !isNaN(firstMonthRange)) &&
+              (!isNaN(secondYearRange) ||
+              !isNaN(secondDateRange) ||
+              !isNaN(secondMonthRange)) &&
             (1 <= firstDateRange && firstDateRange <= 31) &&
             (1 < firstMonthRange && firstMonthRange <= 12) &&
             firstYearRange <= 3000 &&
@@ -168,7 +168,7 @@ export class DatePicker extends Component {
           let month = parseInt(dateSeparated[0], 10);
 
           if (
-            (year !== NaN || date !== NaN || month !== NaN) &&
+              (!isNaN(year) || !isNaN(date) || !isNaN(month)) &&
             (1 <= date && date <= 31) &&
             (1 < month && month <= 12) &&
             year <= 3000
@@ -231,12 +231,12 @@ export class DatePicker extends Component {
         let secondMonthRange = parseInt(dateSeparatedSecondRange[0], 10);
 
         if (
-          (firstYearRange !== NaN ||
-            firstDateRange !== NaN ||
-            firstMonthRange !== NaN) &&
-          (secondYearRange !== NaN ||
-            secondDateRange !== NaN ||
-            secondMonthRange !== NaN) &&
+            (!isNaN(firstYearRange) ||
+            !isNaN(firstDateRange) ||
+            !isNaN(firstMonthRange)) &&
+            (!isNaN(secondYearRange) ||
+            !isNaN(secondDateRange) ||
+            !isNaN(secondMonthRange)) &&
           (1 <= firstDateRange && firstDateRange <= 31) &&
           (1 < firstMonthRange && firstMonthRange <= 12) &&
           firstYearRange <= 3000 &&
@@ -290,7 +290,7 @@ export class DatePicker extends Component {
         let month = parseInt(dateSeparated[0], 10);
 
         if (
-          (year !== NaN || date !== NaN || month !== NaN) &&
+            (!isNaN(year) || !isNaN(date) || !isNaN(month)) &&
           (1 <= date && date <= 31) &&
           (1 < month && month <= 12) &&
           year <= 3000