Passing tests for iso week formats

diff --git a/moment.js b/moment.js
index a6b5d47c6b214217c5d446b5b81639bfac159df2..1eaa8a42ad867f65440b4d6f05051b9d8da79e82 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -23,7 +23,7 @@
         aspNetJsonRegex = /^\/?Date\((\-?\d+)/i,
 
         // format tokens
-        formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|zz?|ZZ?|.)/g,
+        formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|zz?|ZZ?|.)/g,
         localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?)/g,
 
         // parsing tokens
@@ -71,8 +71,8 @@
         formatFunctions = {},
 
         // tokens to ordinalize and pad
-        ordinalizeTokens = 'DDD w M D d'.split(' '),
-        paddedTokens = 'M D H h m s w'.split(' '),
+        ordinalizeTokens = 'DDD w W M D d'.split(' '),
+        paddedTokens = 'M D H h m s w W'.split(' '),
 
         formatTokenFunctions = {
             M    : function () {
@@ -110,6 +110,9 @@
                 a.setDate(a.getDate() + 4 - (a.getDay() || 7));
                 return Math.ceil((1 + (a - (new Date(a.getFullYear(), 0, 1))) / 864e5) / 7);
             },
+            W    : function () {
+                return this.isoWeek();
+            },
             YY   : function () {
                 return leftZeroFill(this.year() % 100, 2);
             },