From: TGJG-XPS\TracyG <tracyg.gilmore@gmail.com>
Date: Sat, 4 Feb 2017 13:15:12 +0000 (+0000)
Subject: Further trial
X-Git-Tag: 2.18.0~12^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=940e59d4e5faa7df943e47f7bf088034449fee35;p=thirdparty%2Fmoment.git

Further trial
---

diff --git a/src/lib/create/from-string.js b/src/lib/create/from-string.js
index b5b87463d..1da560ddf 100644
--- a/src/lib/create/from-string.js
+++ b/src/lib/create/from-string.js
@@ -1,5 +1,6 @@
 import { configFromStringAndFormat } from './from-string-and-format';
 import { hooks } from '../utils/hooks';
+import moment from '../moment';     // Needed for RFC2822 validation of weekday
 import { deprecate } from '../utils/deprecate';
 import getParsingFlags from './parsing-flags';
 
@@ -160,6 +161,9 @@ export function configFromRFC2822(config) {
         dateFormat = 'D MMM ' + ((match[2].length > 10) ? 'YYYY ' : 'YY ');
         timeFormat = 'HH:mm' + (match[4] ? ':ss' : '');
 
+        // 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');
@@ -169,6 +173,8 @@ export function configFromRFC2822(config) {
                 return;
             }
         }
+        /* */
+       
         getParsingFlags(config).rfc2822 = true;
 
         switch (match[5].length) {
diff --git a/src/test/moment/create.js b/src/test/moment/create.js
index 679ae18f5..6acf8518c 100644
--- a/src/test/moment/create.js
+++ b/src/test/moment/create.js
@@ -476,8 +476,10 @@ test('parsing RFC 2822', function (assert) {
 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');
+    /* */
     assert.ok(!moment('Mon, 01 Nov 2016 01:23:45 GMT', moment.RFC_2822, true).isValid(),
         'RFC2822 datetime with mismatching Day (week v date)');
+    /* */
 });
 
 test('parsing iso', function (assert) {