From 10a98e3a13c39cbecadef0ed45692acf7d9a91c5 Mon Sep 17 00:00:00 2001
From: Ash Searle <ash@hexmen.com>
Date: Fri, 13 Jul 2018 22:57:20 +0100
Subject: [PATCH] [bugfix] Fix #4698: Use ISO WeekYear for HTML5_FMT.WEEK

---
 src/moment.js             |  2 +-
 src/test/moment/format.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/moment.js b/src/moment.js
index 9516d285db..89afdf71c3 100644
--- a/src/moment.js
+++ b/src/moment.js
@@ -88,7 +88,7 @@ moment.HTML5_FMT = {
     TIME: 'HH:mm',                                  // <input type="time" />
     TIME_SECONDS: 'HH:mm:ss',                       // <input type="time" step="1" />
     TIME_MS: 'HH:mm:ss.SSS',                        // <input type="time" step="0.001" />
-    WEEK: 'YYYY-[W]WW',                             // <input type="week" />
+    WEEK: 'GGGG-[W]WW',                             // <input type="week" />
     MONTH: 'YYYY-MM'                                // <input type="month" />
 };
 
diff --git a/src/test/moment/format.js b/src/test/moment/format.js
index 07ed379443..0925f653d8 100644
--- a/src/test/moment/format.js
+++ b/src/test/moment/format.js
@@ -5,16 +5,16 @@ import moment from '../../moment';
 module('format');
 
 test('format using constants', function (assert) {
-    var m = moment('2017-09-01T23:40:40.678');
-    assert.equal(m.format(moment.HTML5_FMT.DATETIME_LOCAL), '2017-09-01T23:40', 'datetime local format constant');
-    assert.equal(m.format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS), '2017-09-01T23:40:40', 'datetime local format constant');
-    assert.equal(m.format(moment.HTML5_FMT.DATETIME_LOCAL_MS), '2017-09-01T23:40:40.678', 'datetime local format constant with seconds and millis');
-    assert.equal(m.format(moment.HTML5_FMT.DATE), '2017-09-01', 'date format constant');
+    var m = moment('2016-01-02T23:40:40.678');
+    assert.equal(m.format(moment.HTML5_FMT.DATETIME_LOCAL), '2016-01-02T23:40', 'datetime local format constant');
+    assert.equal(m.format(moment.HTML5_FMT.DATETIME_LOCAL_SECONDS), '2016-01-02T23:40:40', 'datetime local format constant');
+    assert.equal(m.format(moment.HTML5_FMT.DATETIME_LOCAL_MS), '2016-01-02T23:40:40.678', 'datetime local format constant with seconds and millis');
+    assert.equal(m.format(moment.HTML5_FMT.DATE), '2016-01-02', 'date format constant');
     assert.equal(m.format(moment.HTML5_FMT.TIME), '23:40', 'time format constant');
     assert.equal(m.format(moment.HTML5_FMT.TIME_SECONDS), '23:40:40', 'time format constant with seconds');
     assert.equal(m.format(moment.HTML5_FMT.TIME_MS), '23:40:40.678', 'time format constant with seconds and millis');
-    assert.equal(m.format(moment.HTML5_FMT.WEEK), '2017-W35', 'week format constant');
-    assert.equal(m.format(moment.HTML5_FMT.MONTH), '2017-09', 'month format constant');
+    assert.equal(m.format(moment.HTML5_FMT.WEEK), '2015-W53', 'week format constant');
+    assert.equal(m.format(moment.HTML5_FMT.MONTH), '2016-01', 'month format constant');
 });
 
 test('format YY', function (assert) {