Imported Upstream version 7.6.4

1 files changed, 2 insertions, 5 deletions

diff --git a/bower_components/moment/src/lib/format/format.js b/bower_components/moment/src/lib/format/format.js
index 565da01..5378170 100644
--- a/bower_components/moment/src/lib/format/format.js
+++ b/bower_components/moment/src/lib/format/format.js
@@ -1,6 +1,6 @@
 import zeroFill from '../utils/zero-fill';
 
-export var formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g;
+export var formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
 
 var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
 
@@ -68,10 +68,7 @@ export function formatMoment(m, format) {
     }
 
     format = expandFormat(format, m.localeData());
-
-    if (!formatFunctions[format]) {
-        formatFunctions[format] = makeFormatFunction(format);
-    }
+    formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
 
     return formatFunctions[format](m);
 }