Skip to content
This repository was archived by the owner on Feb 18, 2022. It is now read-only.

Commit 9703f8a

Browse files
committed
Add month name parse
1 parent 795a0d2 commit 9703f8a

File tree

1 file changed

+25
-14
lines changed

1 file changed

+25
-14
lines changed

src/js/angular-datepicker.js

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -276,35 +276,46 @@
276276

277277
$scope.year = Number($scope.year) + 1;
278278
}
279-
, localDateTimestamp = function localDateTimestamp(rawDate, dateFormat) {
279+
, localDateTimestamp = function localDateTimestamp(rawDate, dateFormatDefinition) {
280280

281-
var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|MM?M?M?|dd?d?|yy?yy?y?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
282-
var formatDate = dateFormat.match(formattingTokens);
283-
var dateSplit = rawDate.split(/\D/);
284-
var m;
285-
var d;
286-
var y;
281+
var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|MM?M?M?|dd?d?|yy?yy?y?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g
282+
,formatDate = dateFormatDefinition.match(formattingTokens)
283+
,dateSplit, m, d, y, index, el;
284+
285+
for (index = 0; index < datetime.MONTH.length; index += 1) {
286+
el = datetime.MONTH[index];
287+
if (rawDate.indexOf(el) > -1) {
288+
rawDate = rawDate.replace(el, index + 1);
289+
break;
290+
}
291+
}
292+
293+
dateSplit = rawDate.split(/\D/);
287294

288-
console.log('tutu');
295+
dateSplit = dateSplit.filter(function dateSplitFilter(item) {
296+
if (item.length > 0) {
297+
return item;
298+
}
299+
});
289300

290-
formatDate = formatDate.filter(function (item) {
301+
formatDate = formatDate.filter(function fromatDateFilter(item) {
291302
if (item.match(/^[a-zA-Z]+$/i) !== null) {
292303
return item;
293304
}
294305
});
295306

296-
for (var index = 0; index < formatDate.length; index++) {
297-
var element = formatDate[index];
307+
for (index = 0; index < formatDate.length; index += 1) {
308+
el = formatDate[index];
298309

299-
if (element.indexOf('d') > -1) {
310+
if (el.indexOf('d') > -1) {
300311
d = dateSplit[index];
301312
}
302313

303-
if (element.indexOf('M') > -1) {
314+
if (el.indexOf('M') > -1) {
304315
m = dateSplit[index];
305316
}
306317

307-
if (element.indexOf('y') > -1) {
318+
if (el.indexOf('y') > -1) {
308319
y = dateSplit[index];
309320
}
310321
}

0 commit comments

Comments
 (0)