From: Michael Fellinger <m.fellinger@gmail.com>
Date: Tue, 1 Dec 2015 20:28:16 +0000 (+0100)
Subject: don't treat string offsets like ints
X-Git-Tag: 2.11.0~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6016d1df05b99dcc4263cf60b2735f28c26f4470;p=thirdparty%2Fmoment.git

don't treat string offsets like ints
---

diff --git a/src/lib/units/offset.js b/src/lib/units/offset.js
index 6c4487b85..8723c87b8 100644
--- a/src/lib/units/offset.js
+++ b/src/lib/units/offset.js
@@ -104,8 +104,7 @@ export function getSetOffset (input, keepLocalTime) {
     if (input != null) {
         if (typeof input === 'string') {
             input = offsetFromString(matchShortOffset, input);
-        }
-        if (Math.abs(input) < 16) {
+        } else if (Math.abs(input) < 16) {
             input = input * 60;
         }
         if (!this._isUTC && keepLocalTime) {
diff --git a/src/test/moment/utc_offset.js b/src/test/moment/utc_offset.js
index beb6837a9..6768293bb 100644
--- a/src/test/moment/utc_offset.js
+++ b/src/test/moment/utc_offset.js
@@ -27,6 +27,10 @@ test('setter / getter blackbox', function (assert) {
     assert.equal(m.clone().utcOffset(-90).utcOffset(), -90, 'utcOffset -90');
     assert.equal(m.clone().utcOffset('-01:30').utcOffset(), -90, 'utcOffset +01:30 is 90');
     assert.equal(m.clone().utcOffset('-0130').utcOffset(), -90, 'utcOffset +0130 is 90');
+    assert.equal(m.clone().utcOffset('+00:10').utcOffset(), 10, 'utcOffset +00:10 is 10');
+    assert.equal(m.clone().utcOffset('-00:10').utcOffset(), -10, 'utcOffset +00:10 is 10');
+    assert.equal(m.clone().utcOffset('+0010').utcOffset(), 10, 'utcOffset +0010 is 10');
+    assert.equal(m.clone().utcOffset('-0010').utcOffset(), -10, 'utcOffset +0010 is 10');
 });
 
 test('utcOffset shorthand hours -> minutes', function (assert) {