Merge 98cdeff into 943238d

urish · Nov 20, 2015 · efe2db4 · efe2db4
2 parents 943238d + 98cdeff
commit efe2db4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/angular-moment.js b/angular-moment.js
@@ -715,12 +715,18 @@
  			}]);
 	}
 
-	if (typeof define === 'function' && define.amd) {
-		define(['angular', 'moment'], angularMoment);
-	} else if (typeof module !== 'undefined' && module && module.exports) {
-		angularMoment(require('angular'), require('moment'));
-		module.exports = 'angularMoment';
-	} else {
-		angularMoment(angular, (typeof global !== 'undefined' ? global : window).moment);
-	}
+	if (typeof module !== 'undefined' && module && module.exports) {
+		var moment = moment;
+		if (typeof moment === 'undefined' && typeof require === 'function') {
+			moment = requireMoment();
+		} else {
+			throw new Error('Moment cannot be found by angular-moment! Please reference to: https://github.com/urish/angular-moment'); // Add wiki/troubleshooting section?
+		}
+        angularMoment(angular, moment);
+        module.exports = 'angularMoment';
+    } else if (typeof define === 'function' && define.amd) {
+        define(['angular', 'moment'], angularMoment);
+    } else {
+        angularMoment(angular, (typeof global !== 'undefined' ? global : window).moment);
+    }
 })();
diff --git a/angular-moment.min.js b/angular-moment.min.js