Merged branch develop into master

moment · Dec 23, 2016 · 2124976 · 2124976
2 parents 3e9abbf + 12bcf20
commit 2124976
Show file tree

Hide file tree

Showing 22 changed files with 524,224 additions and 26 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -48,5 +48,7 @@ module.exports = function(grunt) {
 
  grunt.registerTask('release', ['jshint', 'data', 'nodeunit', 'build', 'uglify']);
 
+ grunt.registerTask('releaseNoData', ['jshint', 'nodeunit', 'build', 'uglify']);
+
  grunt.registerTask('default', ['jshint', 'nodeunit']);
 };
diff --git a/builds/moment-timezone-with-data-2010-2020.js b/builds/moment-timezone-with-data-2010-2020.js
@@ -1,5 +1,5 @@
 //! moment-timezone.js
-//! version : 0.5.10
+//! version : 0.5.11
 //! Copyright (c) JS Foundation and other contributors
 //! license : MIT
 //! github.com/moment/moment-timezone
@@ -19,12 +19,12 @@
  "use strict";
 
  // 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);
- return moment;
- }
+ // 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);
+ //  return moment;
+ // }
 
- var VERSION = "0.5.10",
+ var VERSION = "0.5.11",
  zones = {},
  links = {},
  names = {},

diff --git a/builds/moment-timezone-with-data-2010-2020.min.js b/builds/moment-timezone-with-data-2010-2020.min.js
diff --git a/builds/moment-timezone-with-data.js b/builds/moment-timezone-with-data.js
diff --git a/builds/moment-timezone-with-data.min.js b/builds/moment-timezone-with-data.min.js
diff --git a/builds/moment-timezone.min.js b/builds/moment-timezone.min.js
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+### `0.5.11` _2016-12-23_
+* Remove log statement when data is loaded twice. [#352](https://github.com/moment/moment-timezone/pull/352)
+
 ### `0.5.10` _2016-11-27_
 * Updated data to IANA TZDB `2016j`. [#422](https://github.com/moment/moment-timezone/pull/422)