Merge pull request moment#2865 from ichernev:fix-undefined-checks

Use typeof checks for undefined for global variables
pjastrz · Jan 9, 2016 · 5925ade · 5925ade
2 parents 74141ae + 66bb2d9
commit 5925ade
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
@@ -41,7 +41,7 @@ function chooseLocale(names) {
 function loadLocale(name) {
     var oldLocale = null;
     // TODO: Find a better way to register and load all the locales in Node
-    if (!locales[name] && !isUndefined(module) &&
+    if (!locales[name] && (typeof module !== 'undefined') &&
             module && module.exports) {
         try {
             oldLocale = globalLocale._abbr;

diff --git a/src/lib/utils/deprecate.js b/src/lib/utils/deprecate.js
@@ -3,7 +3,8 @@ import { hooks } from './hooks';
 import isUndefined from './is-undefined';
 
 function warn(msg) {
-    if (hooks.suppressDeprecationWarnings === false && !isUndefined(console) && console.warn) {
+    if (hooks.suppressDeprecationWarnings === false &&
+            (typeof console !==  'undefined') && console.warn) {
         console.warn('Deprecation warning: ' + msg);
     }
 }