Improved readability of expandFormat function

diff --git a/moment.js b/moment.js
index 34f22fcc2f56aaecda38b1beb6ba1bb90bd1b38e..daae48e523bdbfee38f66015d5353b5453978366 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -646,9 +646,11 @@
             return lang.longDateFormat(input) || input;
         }
 
-        while (i-- && (localFormattingTokens.lastIndex = 0,
-                    localFormattingTokens.test(format))) {
+        localFormattingTokens.lastIndex = 0;
+        while (i >= 0 && localFormattingTokens.test(format)) {
             format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+            localFormattingTokens.lastIndex = 0;
+            i -= 1;
         }
 
         return format;