Skip to content

Commit 496c025

Browse files
authored
Merge pull request #1910 from Jermorin/master
fix(parseDate) use insensitive regex to support +15d with capslock
2 parents 6aca56f + 17af26c commit 496c025

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

js/bootstrap-datepicker.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1771,8 +1771,8 @@
17711771
format = DPGlobal.parseFormat(format);
17721772
if (format.toValue)
17731773
return format.toValue(date, format, language);
1774-
var part_re = /([\-+]\d+)([dmwy])/,
1775-
parts = date.match(/([\-+]\d+)([dmwy])/g),
1774+
var part_re = /([\-+]\d+)([dmwy])/i,
1775+
parts = date.match(/([\-+]\d+)([dmwy])/gi),
17761776
fn_map = {
17771777
d: 'moveDay',
17781778
m: 'moveMonth',
@@ -1785,27 +1785,27 @@
17851785
tomorrow: '+1d'
17861786
},
17871787
part, dir, i, fn;
1788-
if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)){
1788+
if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/i.test(date)){
17891789
date = new Date();
17901790
for (i=0; i < parts.length; i++){
17911791
part = part_re.exec(parts[i]);
17921792
dir = parseInt(part[1]);
1793-
fn = fn_map[part[2]];
1793+
fn = fn_map[part[2].toLowerCase()];
17941794
date = Datepicker.prototype[fn](date, dir);
17951795
}
17961796
return UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
17971797
}
17981798

17991799
if (date in dateAliases) {
18001800
date = dateAliases[date];
1801-
parts = date.match(/([\-+]\d+)([dmwy])/g);
1801+
parts = date.match(/([\-+]\d+)([dmwy])/gi);
18021802

1803-
if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/.test(date)){
1803+
if (/^[\-+]\d+[dmwy]([\s,]+[\-+]\d+[dmwy])*$/i.test(date)){
18041804
date = new Date();
18051805
for (i=0; i < parts.length; i++){
18061806
part = part_re.exec(parts[i]);
18071807
dir = parseInt(part[1]);
1808-
fn = fn_map[part[2]];
1808+
fn = fn_map[part[2].toLowerCase()];
18091809
date = Datepicker.prototype[fn](date, dir);
18101810
}
18111811

0 commit comments

Comments
 (0)