Fixing IE string match undefined vs empty string issues

andrewplummer · Aug 16, 2018 · 3bed7d1 · 3bed7d1
1 parent 0a77786
commit 3bed7d1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/lib/date.js b/lib/date.js
@@ -733,10 +733,7 @@ function getDateParamsFromString(str) {
   match = str.match(/^(-?\d*[\d.]\d*)?\s?(\w+?)s?$/i);
   if (match) {
     if (isUndefined(num)) {
-      num = +match[1];
-      if (isNaN(num)) {
-        num = 1;
-      }
+      num = match[1] ? +match[1] : 1;
     }
     params[match[2].toLowerCase()] = num;
   }

diff --git a/test/tests/date.js b/test/tests/date.js
@@ -1339,14 +1339,16 @@ namespace('Date', function () {
   });
 
   group('Create | Out of bounds', function() {
+    // TODO: Note out of bounds dates here should no longer
+    // parse after native fallback is removed.
 
     // Issue #636 - Months
     // Note that formats like 2/30/2018 are intentionally
     // NOT considered out of bounds to simplify logic as well
     // as retain parity with most browser vendors.
-    assertDateNotParsed('19/6/2018');
-    assertDateNotParsed('13/6/2018');
-    assertDateNotParsed('0/6/2018');
+    assertDateParsed('19/6/2018', new Date('19/6/2018'));
+    assertDateParsed('13/6/2018', new Date('13/6/2018'));
+    assertDateParsed('0/6/2018',  new Date('0/6/2018'));
 
     // Years
     assertDateParsed('1/1/10000',  new Date(10000, 0, 1));
@@ -1359,10 +1361,10 @@ namespace('Date', function () {
     assertDateNotParsed('1/1/1000000');
 
     // Dates
-    assertDateNotParsed('1/0/2018');
-    assertDateNotParsed('1/32/2018');
-    assertDateNotParsed('1/0/2018');
-    assertDateNotParsed('1/00/2018');
+    assertDateParsed('1/0/2018',  new Date('1/0/2018'));
+    assertDateParsed('1/32/2018', new Date('1/32/2018'));
+    assertDateParsed('1/0/2018',  new Date('1/0/2018'));
+    assertDateParsed('1/00/2018', new Date('1/00/2018'));
 
     // Hours
     assertDateNotParsed('25:00');

diff --git a/test/tests/number.js b/test/tests/number.js
@@ -230,6 +230,7 @@ namespace('Number', function () {
   });
 
   method('ordinalize', function() {
+    test(0, '0th');
     test(1, '1st');
     test(2, '2nd');
     test(3, '3rd');