Set AMD global before module definition

diff --git a/moment.js b/moment.js
index 152d0a7b9564e9d4dca91f624d5ebdcd5b2f3b50..e8222753792b3a25e970308972f30d9daef62d4c 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -14,6 +14,7 @@
         VERSION = "2.5.1",
         // the global-scope this is NOT the global object in Node.js
         globalScope = typeof global !== 'undefined' ? global : this,
+        oldGlobalMoment,
         round = Math.round,
         i,
 
@@ -2431,6 +2432,7 @@
         if (typeof ender !== 'undefined') {
             return;
         }
+        oldGlobalMoment = globalScope.moment;
         if (shouldDeprecate) {
             globalScope.moment = deprecate(
                     "Accessing Moment through the global scope is " +
@@ -2448,13 +2450,14 @@
         makeGlobal(true);
     } else if (typeof define === "function" && define.amd) {
         define("moment", function (require, exports, module) {
-            if (module.config && module.config() && module.config().noGlobal !== true) {
-                // If user provided noGlobal, he is aware of global
-                makeGlobal(module.config().noGlobal === undefined);
+            if (module.config && module.config() && module.config().noGlobal === true) {
+                // release the global variable
+                globalScope.moment = oldGlobalMoment;
             }
 
             return moment;
         });
+        makeGlobal(true);
     } else {
         makeGlobal();
     }