Updated guard against unparsed characters to allow extra characters as long as they are separated from the date by whitespace. This maintains compatibility with timepicker extensions.

Fixes #7244 - Datepicker: parseDate() does not throw an exception for long years

1 files changed, 12 insertions, 2 deletions

diff --git a/tests/unit/datepicker/datepicker_tickets.js b/tests/unit/datepicker/datepicker_tickets.js
index d5249f905..10647eb13 100644
--- a/tests/unit/datepicker/datepicker_tickets.js
+++ b/tests/unit/datepicker/datepicker_tickets.js
@@ -30,12 +30,22 @@ test('Ticket 6827: formatDate day of year calculation is wrong during day lights
 });
 
 test('Ticket #7244: date parser does not fail when too many numbers are passed into the date function', function() {
-    expect(1);
+    var date;
     try{
-        var date = $.datepicker.parseDate('dd/mm/yy', '18/04/19881');
+        date = $.datepicker.parseDate('dd/mm/yy', '18/04/19881');
+        ok(false, "Did not properly detect an invalid date");
     }catch(e){
         ok("invalid date detected");
     }
+
+    try {
+      date = $.datepicker.parseDate('dd/mm/yy', '18/04/1988 @ 2:43 pm');
+      equal(date.getDate(), 18);
+      equal(date.getMonth(), 3);
+      equal(date.getFullYear(), 1988);
+    } catch(e) {
+      ok(false, "Did not properly parse date with extra text separated by whitespace");
+    }
 });
 
 })(jQuery);