Only check for nodejs (require) if moment is not globally accessible.

Fix for usage with `momentjs` with `ember-cli`.
MadMG · Mar 4, 2015 · cb445b2 · cb445b2
1 parent d544e38
commit cb445b2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/moment-jdateformatparser.js b/moment-jdateformatparser.js
@@ -157,7 +157,7 @@
     }
   }
 
-  if (typeof require !== 'undefined' && require !== null) {
+  if (typeof this.moment === 'undefined' && typeof require !== 'undefined' && require !== null) {
     if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') { //Check if the environment is Node.js
       hookMoment(require('moment')); //if it is, we have to require it different (without the surrounding Array)
     } else {