From: TGJG-XPS\TracyG Date: Mon, 13 Feb 2017 20:19:41 +0000 (+0000) Subject: Trial day-of-week validation using a vanilla Date object. X-Git-Tag: 2.18.0~12^2~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f2db07c11892eea48af3b60d0877b4b749770fe;p=thirdparty%2Fmoment.git Trial day-of-week validation using a vanilla Date object. --- diff --git a/src/lib/create/from-string.js b/src/lib/create/from-string.js index 429863461..44898d33c 100644 --- a/src/lib/create/from-string.js +++ b/src/lib/create/from-string.js @@ -162,17 +162,18 @@ export function configFromRFC2822(config) { // TODO Confirm the given day-of-week is consistent with the day-of-month-year // NB: Needs an instance of moment, created from the date element of the input string. - /* + /* */ if (match[1]) { // day of week given - console.log('[' + match[1].substr(0,3) + ']', moment(match[2], dateFormat).format('ddd')); - var momentDay = moment(match[2], dateFormat).format('ddd'); +// console.log('[' + match[1].substr(0,3) + ']', moment(match[2], dateFormat).format('ddd')); + var momentDate = new Date(match[2]); + var momentDay = ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'][momentDate.getDay()]; if (match[1].substr(0,3) !== momentDay) { config._isValid = false; return; } } - */ + /* */ getParsingFlags(config).rfc2822 = true; switch (match[5].length) { diff --git a/src/test/moment/create.js b/src/test/moment/create.js index 65217b37e..408432e47 100644 --- a/src/test/moment/create.js +++ b/src/test/moment/create.js @@ -477,8 +477,11 @@ test('non RFC 2822 strings', function (assert) { assert.ok(!moment('Tue. 01 Nov 2016 01:23:45 GMT', moment.RFC_2822, true).isValid(), 'RFC2822 datetime with all options but invalid day delimiter'); /* TODO Confirm the given day-of-week is consistent with the day-of-month-year + * + */ assert.ok(!moment('Mon, 01 Nov 2016 01:23:45 GMT', moment.RFC_2822, true).isValid(), 'RFC2822 datetime with mismatching Day (week v date)'); + /* */ });