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 <brinley@unbolt.net>
moment · May 16, 2020 · a04803a · a04803a
1 parent 9c7da9a
commit a04803a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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);