Skip to content

Commit

Permalink
6.6.4rc
Browse files Browse the repository at this point in the history
  • Loading branch information
spencermountain committed Sep 14, 2020
1 parent 6fd41f8 commit e0673e8
Show file tree
Hide file tree
Showing 7 changed files with 229 additions and 463 deletions.
2 changes: 1 addition & 1 deletion _version.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = '6.6.3'
module.exports = '6.6.4'
41 changes: 7 additions & 34 deletions builds/spacetime.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* spencermountain/spacetime 6.6.3 Apache 2.0 */
/* spencermountain/spacetime 6.6.4 Apache 2.0 */
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
Expand Down Expand Up @@ -118,9 +118,11 @@

exports.formatTimezone = function (offset) {
var delimiter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
var absOffset = Math.abs(offset);
var sign = offset > 0 ? '+' : '-';
return "".concat(sign).concat(exports.zeroPad(absOffset)).concat(delimiter, "00");
var absOffset = Math.abs(offset);
var hours = exports.zeroPad(parseInt('' + absOffset, 10));
var minutes = exports.zeroPad(absOffset % 1 * 60);
return "".concat(sign).concat(hours).concat(delimiter).concat(minutes);
};
});
var fns_1 = fns.isLeapYear;
Expand Down Expand Up @@ -1390,36 +1392,7 @@

var isoOffset = function isoOffset(s) {
var offset = s.timezone().current.offset;
var isNegative = offset < 0;
var minute = '00'; //handle 5.5 → '5:30'

if (Math.abs(offset % 1) === 0.5) {
minute = '30';

if (offset >= 0) {
offset = Math.floor(offset);
} else {
offset = Math.ceil(offset);
}
}

if (isNegative) {
//handle negative sign
offset *= -1;
offset = fns.zeroPad(offset, 2);
offset = '-' + offset;
} else {
offset = fns.zeroPad(offset, 2);
offset = '+' + offset;
}

offset = offset + ':' + minute; //'Z' means 00

if (offset === '+00:00') {
offset = 'Z';
}

return offset;
return !offset ? 'Z' : fns.formatTimezone(offset, ':');
};

var _offset = isoOffset;
Expand Down Expand Up @@ -4072,7 +4045,7 @@

var whereIts_1 = whereIts;

var _version = '6.6.3';
var _version = '6.6.4';

var main$1 = function main(input, tz, options) {
return new spacetime(input, tz, options);
Expand Down
2 changes: 1 addition & 1 deletion builds/spacetime.min.js

Large diffs are not rendered by default.

41 changes: 7 additions & 34 deletions builds/spacetime.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* spencermountain/spacetime 6.6.3 Apache 2.0 */
/* spencermountain/spacetime 6.6.4 Apache 2.0 */
function createCommonjsModule(fn, module) {
return module = { exports: {} }, fn(module, module.exports), module.exports;
}
Expand Down Expand Up @@ -112,9 +112,11 @@ var fns = createCommonjsModule(function (module, exports) {

exports.formatTimezone = function (offset) {
var delimiter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
var absOffset = Math.abs(offset);
var sign = offset > 0 ? '+' : '-';
return "".concat(sign).concat(exports.zeroPad(absOffset)).concat(delimiter, "00");
var absOffset = Math.abs(offset);
var hours = exports.zeroPad(parseInt('' + absOffset, 10));
var minutes = exports.zeroPad(absOffset % 1 * 60);
return "".concat(sign).concat(hours).concat(delimiter).concat(minutes);
};
});
var fns_1 = fns.isLeapYear;
Expand Down Expand Up @@ -1384,36 +1386,7 @@ var days = {

var isoOffset = function isoOffset(s) {
var offset = s.timezone().current.offset;
var isNegative = offset < 0;
var minute = '00'; //handle 5.5 → '5:30'

if (Math.abs(offset % 1) === 0.5) {
minute = '30';

if (offset >= 0) {
offset = Math.floor(offset);
} else {
offset = Math.ceil(offset);
}
}

if (isNegative) {
//handle negative sign
offset *= -1;
offset = fns.zeroPad(offset, 2);
offset = '-' + offset;
} else {
offset = fns.zeroPad(offset, 2);
offset = '+' + offset;
}

offset = offset + ':' + minute; //'Z' means 00

if (offset === '+00:00') {
offset = 'Z';
}

return offset;
return !offset ? 'Z' : fns.formatTimezone(offset, ':');
};

var _offset = isoOffset;
Expand Down Expand Up @@ -4066,7 +4039,7 @@ var whereIts = function whereIts(a, b) {

var whereIts_1 = whereIts;

var _version = '6.6.3';
var _version = '6.6.4';

var main$1 = function main(input, tz, options) {
return new spacetime(input, tz, options);
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ This project follows semVer, where:
* don't reverse dates for .every() method
-->

### v6.6.4

- [fix] 45m offset formatting issue
- update deps

### v6.6.3

- support for 'today' param with null inputs
Expand Down
Loading

0 comments on commit e0673e8

Please sign in to comment.