From 1d6e78cffc9bd4591096dc3752e5b8c00b59f3e6 Mon Sep 17 00:00:00 2001
From: Xotic750 <xotic750@gmail.com>
Date: Mon, 16 Sep 2013 18:04:30 +0200
Subject: [PATCH] Improved readability of expandFormat function

---
 moment.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/moment.js b/moment.js
index 34f22fcc2..daae48e52 100644
--- 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;
-- 
2.47.2