Merge pull request #15 from zhaozhiming/master

clear the webpack warning
MadMG · Jul 21, 2017 · 458fbf0 · 458fbf0
2 parents b52ce85 + a6d3a02
commit 458fbf0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/moment-jdateformatparser.js b/moment-jdateformatparser.js
@@ -176,8 +176,8 @@
     }
   }
 
-  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
+  if (!this.moment && typeof require === 'function') {
+    if (module && module.exports) { //Check if the environment is Node.js
       hookMoment(require('moment')); //if it is, we have to require it different (without the surrounding Array)
     } else {
       require(['moment'], function (moment) {
@@ -188,7 +188,6 @@
     hookMoment(this.moment);
   }
 
-
   /**
    * Translates the java date format String to a momentjs format String.
    *