Skip to content

Commit

Permalink
higher version of moment, for zone
Browse files Browse the repository at this point in the history
  • Loading branch information
arshaw committed Aug 14, 2016
1 parent 57ea61f commit 319636e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"copyright": "2016 Adam Shaw",
"dependencies": {
"jquery": ">=2.0.0",
"moment": ">=2.8.1"
"moment": ">=2.9.0"
},
"main": [
"dist/fullcalendar.js",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"copyright": "2016 Adam Shaw",
"dependencies": {
"jquery": ">=2.0.0",
"moment": ">=2.8.1"
"moment": ">=2.9.0"
},
"version": "0.0.0",
"releaseDate": "1970-01-01",
Expand Down
1 change: 0 additions & 1 deletion src/locale.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ function populateInstanceComputableOptions(options) {


// Returns moment's internal locale data. If doesn't exist, returns English.
// Works with moment-pre-2.8
function getMomentLocaleData(localeCode) {
return moment.localeData(localeCode) || moment.localeData('en');
}
Expand Down
8 changes: 1 addition & 7 deletions src/moment-ext.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,7 @@ function makeMoment(args, parseAsUTC, parseZone) {
mom._ambigZone = true;
}
else if (isSingleString) {
if (mom.utcOffset) {
mom.utcOffset(input); // if not a valid zone, will assign UTC
}
else {
mom.zone(input); // for moment-pre-2.9
}
mom.utcOffset(input); // if not a valid zone, will assign UTC
}
}
}
Expand Down Expand Up @@ -304,7 +299,6 @@ newMomentProto.utc = function() {
// methods for arbitrarily manipulating timezone offset.
// should clear time/zone ambiguity when called.
$.each([
'zone', // only in moment-pre-2.9. deprecated afterwards
'utcOffset'
], function(i, name) {
if (oldMomentProto[name]) { // original method exists?
Expand Down

0 comments on commit 319636e

Please sign in to comment.