From: Tim Wood <washwithcare@gmail.com>
Date: Tue, 30 Oct 2012 18:51:14 +0000 (-0700)
Subject: Fixing race condition with moment.langData(unloadedLangKey)
X-Git-Tag: 2.0.0~27^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86a3c532db25eb16edf8f7bb1b658a533453535b;p=thirdparty%2Fmoment.git

Fixing race condition with moment.langData(unloadedLangKey)
---

diff --git a/moment.js b/moment.js
index 4f54b853f..6677f1c65 100644
--- a/moment.js
+++ b/moment.js
@@ -477,6 +477,9 @@
         if (!key) {
             return moment.fn._lang;
         }
+        if (!languages[key] && hasModule) {
+            require('./lang/' + key);
+        }
         return languages[key];
     }
 
@@ -944,8 +947,8 @@
         }
         if (values) {
             loadLang(key, values);
-        } else if (!languages[key] && hasModule) {
-            require('./lang/' + key);
+        } else if (!languages[key]) {
+            getLangDefinition(key);
         }
         moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key);
     };