From a04803a6020a367dbe0cf89924d50792fb619b00 Mon Sep 17 00:00:00 2001 From: Elena Sharovar Date: Sat, 16 May 2020 16:43:29 +0300 Subject: [PATCH] Develop -> Master (#847) * 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 Co-authored-by: Brinley Ang --- .travis.yml | 2 -- moment-timezone.js | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e314a1b..f3252441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: node_js node_js: - "node" - "8" - - "6" - - "4" install: - npm install - npm install -g grunt-cli diff --git a/moment-timezone.js b/moment-timezone.js index df762a83..b625ce5f 100644 --- a/moment-timezone.js +++ b/moment-timezone.js @@ -18,6 +18,11 @@ }(this, function (moment) { "use strict"; + // Resolves es6 module loading issue + if (moment.version === undefined) { + moment = moment.default; + } + // Do not load moment-timezone a second time. // if (moment.tz !== undefined) { // logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);