Merge pull request #8 from dettier/master

Error parsing timezone +0000
taylorhakes · Nov 18, 2015 · 9658599 · 9658599
2 parents 090b331 + 402a24a
commit 9658599
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/fecha.js b/fecha.js
@@ -232,7 +232,7 @@
 			dateInfo.hour = +dateInfo.hour + 12
 		}
 
-		if (dateInfo.timezoneOffset) {
+		if (dateInfo.timezoneOffset != null) {
 			dateInfo.minute = +(dateInfo.minute || 0) - +dateInfo.timezoneOffset;
 			date = new Date(Date.UTC(dateInfo.year || today.getFullYear(), dateInfo.month || 0, dateInfo.day || 1,
 				dateInfo.hour || 0, dateInfo.minute || 0, dateInfo.second || 0, dateInfo.millisecond || 0));

diff --git a/fecha.spec.js b/fecha.spec.js
@@ -70,6 +70,10 @@
 				expect(fecha.parse('09:20:31 GMT-0500 (EST)', 'HH:mm:ss ZZ')).toEqual(new Date(Date.UTC(2015, 0, 1, 14,
 					20, 31)));
 			});
+			it('UTC timezone offset', function () {
+				expect(fecha.parse('09:20:31 GMT-0000 (UTC)', 'HH:mm:ss ZZ')).toEqual(new Date(Date.UTC(2015, 0, 1, 9,
+					20, 31)));
+			});
 			it('invalid date', function () {
 				expect(fecha.parse('hello', 'HH:mm:ss ZZ')).toEqual(false);
 			});
@@ -176,4 +180,4 @@
 			});
 		});
 	});
-})();
+})();