[Pkg-javascript-commits] [node-moment] 01/05: New upstream version 2.19.2+ds
Julien Puydt
julien.puydt at laposte.net
Mon Nov 13 07:49:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository node-moment.
commit 99928e91d873fc9c6a7f0b6c5cdf77f0fa2ef7db
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Mon Nov 13 08:44:40 2017 +0100
New upstream version 2.19.2+ds
---
CHANGELOG.md | 7 +++++++
Moment.js.nuspec | 8 ++++----
component.json | 2 +-
meteor/package.js | 2 +-
min/moment-with-locales.js | 13 +++++++------
min/tests.js | 12 ++++++++++++
moment.js | 13 +++++++------
package.json | 2 +-
src/lib/locale/locales.js | 7 ++++---
src/lib/moment/get-set.js | 2 +-
src/moment.js | 4 ++--
src/test/moment/getters_setters.js | 4 ++++
src/test/moment/locale_update.js | 8 ++++++++
13 files changed, 59 insertions(+), 25 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2900f7..f56995c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
Changelog
=========
+### 2.19.2 [See changelog (it's the same >:D)](https://gist.github.com/ichernev/76b1a3f33d3a8ff9665ce434a45221d0)
+
+* Release Nov 11, 2017
+
+* [#4255](https://github.com/moment/moment/pull/4255) [bugfix] Fix year setter for random days in a leap year, fixes [#4238](https://github.com/moment/moment/issues/4238)
+* [#4242](https://github.com/moment/moment/pull/4242) [bugfix] updateLocale now tries to load parent, fixes [#3626](https://github.com/moment/moment/issues/3626)
+
### 2.19.1
* Release Oct 11, 2017
diff --git a/Moment.js.nuspec b/Moment.js.nuspec
index 7b4cbc8..bf5c860 100644
--- a/Moment.js.nuspec
+++ b/Moment.js.nuspec
@@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Moment.js</id>
- <version>2.19.1</version>
+ <version>2.19.2</version>
<authors>Tim Wood, Iskren Chernev, Moment.js contributors</authors>
<owners>Cory Deppen, Iskren Chernev</owners>
<description>A lightweight JavaScript date library for parsing, manipulating, and formatting dates.</description>
<releaseNotes>
- * Release Oct 11, 2017
+ * Release Nov 11, 2017
- Make react native and webpack both work
- * #4225 #4226 #4232
+ * [#4255](https://github.com/moment/moment/pull/4255) [bugfix] Fix year setter for random days in a leap year, fixes [#4238](https://github.com/moment/moment/issues/4238)
+ * [#4242](https://github.com/moment/moment/pull/4242) [bugfix] updateLocale now tries to load parent, fixes [#3626](https://github.com/moment/moment/issues/3626)
</releaseNotes>
<projectUrl>http://momentjs.com/</projectUrl>
<iconUrl>http://pbs.twimg.com/profile_images/482670411402858496/Xrtdc94q_normal.png</iconUrl>
diff --git a/component.json b/component.json
index f3c8f97..aa803c8 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
{
"name": "moment",
- "version": "2.19.1",
+ "version": "2.19.2",
"main": "moment.js",
"description": "Parse, validate, manipulate, and display dates in JavaScript.",
"files": [
diff --git a/meteor/package.js b/meteor/package.js
index de4b7b5..8a3b487 100644
--- a/meteor/package.js
+++ b/meteor/package.js
@@ -6,7 +6,7 @@ var packageName = 'momentjs:moment'; // https://atmospherejs.com/momentjs/momen
Package.describe({
name: packageName,
summary: 'Moment.js (official): parse, validate, manipulate, and display dates - official Meteor packaging',
- version: '2.19.1',
+ version: '2.19.2',
git: 'https://github.com/moment/moment.git'
});
diff --git a/min/moment-with-locales.js b/min/moment-with-locales.js
index 36becce..5a3c3db 100644
--- a/min/moment-with-locales.js
+++ b/min/moment-with-locales.js
@@ -808,7 +808,7 @@ function get (mom, unit) {
function set$1 (mom, unit, value) {
if (mom.isValid() && !isNaN(value)) {
- if (unit === 'FullYear' && isLeapYear(mom.year())) {
+ if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
}
else {
@@ -1914,10 +1914,11 @@ function defineLocale (name, config) {
function updateLocale(name, config) {
if (config != null) {
- var locale, parentConfig = baseConfig;
+ var locale, tmpLocale, parentConfig = baseConfig;
// MERGE
- if (locales[name] != null) {
- parentConfig = locales[name]._config;
+ tmpLocale = loadLocale(name);
+ if (tmpLocale != null) {
+ parentConfig = tmpLocale._config;
}
config = mergeConfigs(parentConfig, config);
locale = new Locale(config);
@@ -4471,12 +4472,12 @@ addParseToken('x', function (input, array, config) {
// Side effect imports
//! moment.js
-//! version : 2.19.1
+//! version : 2.19.2
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
-hooks.version = '2.19.1';
+hooks.version = '2.19.2';
setHookCallback(createLocal);
diff --git a/min/tests.js b/min/tests.js
index 12335b8..e6da26b 100644
--- a/min/tests.js
+++ b/min/tests.js
@@ -63259,6 +63259,10 @@ test('year setter', function (assert) {
var b = moment([2012, 1, 29]);
assert.equal(moment(b).year(2017).format('YYYY-MM-DD'), '2017-02-28', 'set from last day of february on a leap year to a non leap year');
assert.equal(moment(b).year(2004).format('YYYY-MM-DD'), '2004-02-29', 'set from last day of february on a leap year to a leap year');
+
+ var c = moment([2012, 9, 4]);
+ assert.equal(moment(c).year(2017).format('YYYY-MM-DD'), '2017-10-04', 'set from a random day on a leap year to a non leap year');
+ assert.equal(moment(c).year(2004).format('YYYY-MM-DD'), '2004-10-04', 'set from a random day on a leap year to a leap year');
});
test('object set ordering', function (assert) {
@@ -67753,6 +67757,14 @@ test('months', function (assert) {
assert.ok(moment.utc('2015-01-01', 'YYYY-MM-DD').format('MMMM'), 'First', 'months uses child');
});
+test('update existing locale', function (assert) {
+ moment.updateLocale('de', {
+ monthsShort: ['JAN', 'FEB', 'MÄR', 'APR', 'MAI', 'JUN', 'JUL', 'AUG', 'SEP', 'OKT', 'NOV', 'DEZ']
+ });
+ assert.equal(moment('2017-02-01').format('YYYY MMM MMMM'), '2017 FEB Februar');
+ moment.updateLocale('de', null);
+});
+
})));
diff --git a/moment.js b/moment.js
index 1704b2a..f806995 100644
--- a/moment.js
+++ b/moment.js
@@ -1,5 +1,5 @@
//! moment.js
-//! version : 2.19.1
+//! version : 2.19.2
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
@@ -814,7 +814,7 @@ function get (mom, unit) {
function set$1 (mom, unit, value) {
if (mom.isValid() && !isNaN(value)) {
- if (unit === 'FullYear' && isLeapYear(mom.year())) {
+ if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
}
else {
@@ -1920,10 +1920,11 @@ function defineLocale (name, config) {
function updateLocale(name, config) {
if (config != null) {
- var locale, parentConfig = baseConfig;
+ var locale, tmpLocale, parentConfig = baseConfig;
// MERGE
- if (locales[name] != null) {
- parentConfig = locales[name]._config;
+ tmpLocale = loadLocale(name);
+ if (tmpLocale != null) {
+ parentConfig = tmpLocale._config;
}
config = mergeConfigs(parentConfig, config);
locale = new Locale(config);
@@ -4477,7 +4478,7 @@ addParseToken('x', function (input, array, config) {
// Side effect imports
-hooks.version = '2.19.1';
+hooks.version = '2.19.2';
setHookCallback(createLocal);
diff --git a/package.json b/package.json
index 7956bb7..71406d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "moment",
- "version": "2.19.1",
+ "version": "2.19.2",
"description": "Parse, validate, manipulate, and display dates",
"homepage": "http://momentjs.com",
"author": "Iskren Ivov Chernev <iskren.chernev at gmail.com> (https://github.com/ichernev)",
diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
index 4efebb8..7d8fb26 100644
--- a/src/lib/locale/locales.js
+++ b/src/lib/locale/locales.js
@@ -131,10 +131,11 @@ export function defineLocale (name, config) {
export function updateLocale(name, config) {
if (config != null) {
- var locale, parentConfig = baseConfig;
+ var locale, tmpLocale, parentConfig = baseConfig;
// MERGE
- if (locales[name] != null) {
- parentConfig = locales[name]._config;
+ tmpLocale = loadLocale(name);
+ if (tmpLocale != null) {
+ parentConfig = tmpLocale._config;
}
config = mergeConfigs(parentConfig, config);
locale = new Locale(config);
diff --git a/src/lib/moment/get-set.js b/src/lib/moment/get-set.js
index ce5ac82..f5035f1 100644
--- a/src/lib/moment/get-set.js
+++ b/src/lib/moment/get-set.js
@@ -24,7 +24,7 @@ export function get (mom, unit) {
export function set (mom, unit, value) {
if (mom.isValid() && !isNaN(value)) {
- if (unit === 'FullYear' && isLeapYear(mom.year())) {
+ if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
}
else {
diff --git a/src/moment.js b/src/moment.js
index c49fe84..00444d5 100644
--- a/src/moment.js
+++ b/src/moment.js
@@ -1,12 +1,12 @@
//! moment.js
-//! version : 2.19.1
+//! version : 2.19.2
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
import { hooks as moment, setHookCallback } from './lib/utils/hooks';
-moment.version = '2.19.1';
+moment.version = '2.19.2';
import {
min,
diff --git a/src/test/moment/getters_setters.js b/src/test/moment/getters_setters.js
index 280ee6e..2c47a89 100644
--- a/src/test/moment/getters_setters.js
+++ b/src/test/moment/getters_setters.js
@@ -277,6 +277,10 @@ test('year setter', function (assert) {
var b = moment([2012, 1, 29]);
assert.equal(moment(b).year(2017).format('YYYY-MM-DD'), '2017-02-28', 'set from last day of february on a leap year to a non leap year');
assert.equal(moment(b).year(2004).format('YYYY-MM-DD'), '2004-02-29', 'set from last day of february on a leap year to a leap year');
+
+ var c = moment([2012, 9, 4]);
+ assert.equal(moment(c).year(2017).format('YYYY-MM-DD'), '2017-10-04', 'set from a random day on a leap year to a non leap year');
+ assert.equal(moment(c).year(2004).format('YYYY-MM-DD'), '2004-10-04', 'set from a random day on a leap year to a leap year');
});
test('object set ordering', function (assert) {
diff --git a/src/test/moment/locale_update.js b/src/test/moment/locale_update.js
index ab956b4..3a525e2 100644
--- a/src/test/moment/locale_update.js
+++ b/src/test/moment/locale_update.js
@@ -164,3 +164,11 @@ test('months', function (assert) {
});
assert.ok(moment.utc('2015-01-01', 'YYYY-MM-DD').format('MMMM'), 'First', 'months uses child');
});
+
+test('update existing locale', function (assert) {
+ moment.updateLocale('de', {
+ monthsShort: ['JAN', 'FEB', 'MÄR', 'APR', 'MAI', 'JUN', 'JUL', 'AUG', 'SEP', 'OKT', 'NOV', 'DEZ']
+ });
+ assert.equal(moment('2017-02-01').format('YYYY MMM MMMM'), '2017 FEB Februar');
+ moment.updateLocale('de', null);
+});
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-moment.git
More information about the Pkg-javascript-commits
mailing list