From 286646c389223df71ea08213fb10a7c6342d9c91 Mon Sep 17 00:00:00 2001 From: Elena Sharovar Date: Sat, 16 May 2020 17:37:33 +0300 Subject: [PATCH] Develop -> Master (#848) * Merged @adgrace pull request #410 * Merged @adgrace pull request #410 * Bugfix: zone country is detected incorrect if link is used * Bugfix: zone country is detected incorrect if link is used * Decrease build size * Order zones by name * Updated 2019c files * Updated changelog * Resolve es6 loading issue where moment is undefined * Removed node 4 and 6 from travis.yml * Corrected version numbers (#845) Version numbers were incorrect so fixed it. * Fixed changelog to represent proper release versions (#839) * Fixed changelog to represent proper release versions * Removed node v4 and 6 from travis build, because as pointed by other the ES6 syntax now included in the lib aren't supported with those earlier node versions. Co-authored-by: Alexandre Couillard * Resolves es6 module loading issue * Corrected version numbers (#845) Version numbers were incorrect so fixed it. * Resolves es6 module loading issue Co-authored-by: Brinley Ang Co-authored-by: praneeth-m Co-authored-by: Jackalex36 Co-authored-by: Alexandre Couillard --- changelog.md | 4 ++-- moment-timezone.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index b3693fc4..a403f9da 100644 --- a/changelog.md +++ b/changelog.md @@ -1,11 +1,11 @@ -### `0.5.29` _2020-02-21_ +### `0.5.28` _2020-02-21_ Merged pull request #410 from @adgrace: * Added a method `moment.tz.zonesForCountry(country_code)` which returns all timezones for the country * Added a method `moment.tz(timezone_id).countries()` to get countries for some time zone * Added a method `moment.tz.countries()` to get all country codes * And as you know `moment.tz.zones()` already exists -### `0.5.28` _2019-10-14_ +### `0.5.27` _2019-10-14_ * Updated data to IANA TZDB `2019c` ### `0.5.26` _2019-06-06_ diff --git a/moment-timezone.js b/moment-timezone.js index b625ce5f..7a535ff8 100644 --- a/moment-timezone.js +++ b/moment-timezone.js @@ -19,7 +19,7 @@ "use strict"; // Resolves es6 module loading issue - if (moment.version === undefined) { + if (moment.version === undefined && moment.default) { moment = moment.default; }