Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
Merge 8da2526 into c3f3361
Browse files Browse the repository at this point in the history
  • Loading branch information
kylecannon committed Mar 22, 2016
2 parents c3f3361 + 8da2526 commit b25cbf5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions angular-moment.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

function requireMoment() {
try {
return require('moment'); // Using nw.js or browserify?
return require('moment-timezone'); // Using nw.js or browserify?
} catch (e) {
throw new Error('Please install moment via npm. Please reference to: https://github.com/urish/angular-moment'); // Add wiki/troubleshooting section?
}
Expand Down Expand Up @@ -716,9 +716,9 @@
}

if (typeof define === 'function' && define.amd) {
define(['angular', 'moment'], angularMoment);
define(['angular', 'moment-timezone'], angularMoment);
} else if (typeof module !== 'undefined' && module && module.exports) {
angularMoment(require('angular'), require('moment'));
angularMoment(require('angular'), require('moment-timezone'));
module.exports = 'angularMoment';
} else {
angularMoment(angular, (typeof global !== 'undefined' ? global : window).moment);
Expand Down
2 changes: 1 addition & 1 deletion angular-moment.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b25cbf5

Please sign in to comment.