Merge pull request #275 from d10/exports-issue

Fix issue when an element with ID of `exports` is defined in the browser.
moment · Dec 10, 2015 · dde5b92 · dde5b92
2 parents c3983ea + fcd7360
commit dde5b92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/moment-timezone-utils.js b/moment-timezone-utils.js
@@ -10,7 +10,7 @@
 	/*global define*/
 	if (typeof define === 'function' && define.amd) {
 		define(['moment'], factory);                 // AMD
-	} else if (typeof exports === 'object') {
+	} else if (typeof module === 'object' && module.exports) {
 		module.exports = factory(require('./'));     // Node
 	} else {
 		factory(root.moment);                        // Browser

diff --git a/moment-timezone.js b/moment-timezone.js
@@ -10,7 +10,7 @@
 	/*global define*/
 	if (typeof define === 'function' && define.amd) {
 		define(['moment'], factory);                 // AMD
-	} else if (typeof exports === 'object') {
+	} else if (typeof module === 'object' && module.exports) {
 		module.exports = factory(require('moment')); // Node
 	} else {
 		factory(root.moment);                        // Browser