← All changes | build/scripts/date/index.js +16 -28 23.6.2 → 22.7.0 View file →

		@@ -1782,38 +1782,29 @@
1782	1782	alternative: "wp.date.getSettings"
1783	1783	});
1784	1784	return getSettings();
1785	1785	}
1786		- var wpZonePacked;
1787		- function ensureWPTimezone() {
1788		- if (!import_moment.default.tz.zone(WP_ZONE)) {
1789		- if (wpZonePacked) {
1790		- import_moment.default.tz.add(wpZonePacked);
1791		- } else {
1792		- setupWPTimezone();
1793		- }
1794		- }
1795		- }
1796	1786	function setupWPTimezone() {
1797	1787	const currentTimezone = import_moment.default.tz.zone(settings.timezone.string);
1798		- let packed;
1799	1788	if (currentTimezone) {
1800		- packed = import_moment.default.tz.pack({
1801		- name: WP_ZONE,
1802		- abbrs: currentTimezone.abbrs,
1803		- untils: currentTimezone.untils,
1804		- offsets: currentTimezone.offsets
1805		- });
	1789	+ import_moment.default.tz.add(
	1790	+ import_moment.default.tz.pack({
	1791	+ name: WP_ZONE,
	1792	+ abbrs: currentTimezone.abbrs,
	1793	+ untils: currentTimezone.untils,
	1794	+ offsets: currentTimezone.offsets
	1795	+ })
	1796	+ );
1806	1797	} else {
1807		- packed = import_moment.default.tz.pack({
1808		- name: WP_ZONE,
1809		- abbrs: [WP_ZONE],
1810		- untils: [null],
1811		- offsets: [-settings.timezone.offset * 60 || 0]
1812		- });
	1798	+ import_moment.default.tz.add(
	1799	+ import_moment.default.tz.pack({
	1800	+ name: WP_ZONE,
	1801	+ abbrs: [WP_ZONE],
	1802	+ untils: [null],
	1803	+ offsets: [-settings.timezone.offset * 60 || 0]
	1804	+ })
	1805	+ );
1813	1806	}
1814		- wpZonePacked = packed;
1815		- import_moment.default.tz.add(packed);
1816	1807	}
1817	1808	var MINUTE_IN_SECONDS = 60;
1818	1809	var HOUR_IN_MINUTES = 60;
1819	1810	var HOUR_IN_SECONDS = 60 * MINUTE_IN_SECONDS;
		@@ -1995,15 +1986,13 @@
1995	1986	dateMoment.locale(settings.l10n.locale);
1996	1987	return format(dateFormat, dateMoment);
1997	1988	}
1998	1989	function isInTheFuture(dateValue) {
1999		- ensureWPTimezone();
2000	1990	const now = import_moment.default.tz(WP_ZONE);
2001	1991	const momentObject = import_moment.default.tz(dateValue, WP_ZONE);
2002	1992	return momentObject.isAfter(now);
2003	1993	}
2004	1994	function getDate(dateString) {
2005		- ensureWPTimezone();
2006	1995	if (!dateString) {
2007	1996	return import_moment.default.tz(WP_ZONE).toDate();
2008	1997	}
2009	1998	return import_moment.default.tz(dateString, WP_ZONE).toDate();
		@@ -2008,9 +1997,8 @@
2008	1997	}
2009	1998	return import_moment.default.tz(dateString, WP_ZONE).toDate();
2010	1999	}
2011	2000	function humanTimeDiff(from, to) {
2012		- ensureWPTimezone();
2013	2001	const fromMoment = import_moment.default.tz(from, WP_ZONE);
2014	2002	const toMoment = to ? import_moment.default.tz(to, WP_ZONE) : import_moment.default.tz(WP_ZONE);
2015	2003	return fromMoment.from(toMoment);
2016	2004	}