@ui5/webcomponents-localization 0.0.0-96e98c995 → 0.0.0-97c4a1259

package/dist/sap/ui/core/date/UniversalDate.js

@@ -1,10 +1,10 @@
 import BaseObject from '../../base/Object.js';
 import Configuration from '../Configuration.js';
-import Locale from '../Locale.js';
 import LocaleData from '../LocaleData.js';
 import _Calendars from './_Calendars.js';
 import CalendarUtils from './CalendarUtils.js';
 import CalendarWeekNumbering from './CalendarWeekNumbering.js';
+import UI5Date from './UI5Date.js';
 var UniversalDate = BaseObject.extend('sap.ui.core.date.UniversalDate', {
     constructor: function () {
         var clDate = UniversalDate.getClass();
@@ -19,6 +19,9 @@ UniversalDate.now = function () {
     return Date.now();
 };
 UniversalDate.prototype.createDate = function (clDate, aArgs) {
+    if (clDate === Date) {
+        return UI5Date.getInstance.apply(null, aArgs);
+    }
     switch (aArgs.length) {
     case 0:
         return new clDate();
@@ -42,10 +45,8 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
     var clDate, oInstance;
     if (oDate instanceof UniversalDate) {
         oDate = oDate.getJSDate();
-    } else if (!oDate) {
-        oDate = new Date();
     }
-    if (isNaN(oDate.getTime())) {
+    if (oDate && isNaN(oDate.getTime())) {
         throw new Error('The given date object is invalid');
     }
     if (!sCalendarType) {
@@ -53,7 +54,7 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
     }
     clDate = UniversalDate.getClass(sCalendarType);
     oInstance = Object.create(clDate.prototype);
-    oInstance.oDate = oDate;
+    oInstance.oDate = oDate ? UI5Date.getInstance(oDate) : UI5Date.getInstance();
     oInstance.sCalendarType = sCalendarType;
     return oInstance;
 };
@@ -123,20 +124,16 @@ UniversalDate.prototype.getUTCEra = function () {
 UniversalDate.prototype.setUTCEra = function (iEra) {
 };
 UniversalDate.prototype.getWeek = function (oLocale, vCalendarWeekNumbering) {
-    checkWeekConfig(vCalendarWeekNumbering);
     return UniversalDate.getWeekByDate(this.sCalendarType, this.getFullYear(), this.getMonth(), this.getDate(), oLocale, vCalendarWeekNumbering);
 };
 UniversalDate.prototype.setWeek = function (oWeek, oLocale, vCalendarWeekNumbering) {
-    checkWeekConfig(vCalendarWeekNumbering);
     var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week, oLocale, vCalendarWeekNumbering);
     this.setFullYear(oDate.year, oDate.month, oDate.day);
 };
 UniversalDate.prototype.getUTCWeek = function (oLocale, vCalendarWeekNumbering) {
-    checkWeekConfig(vCalendarWeekNumbering);
     return UniversalDate.getWeekByDate(this.sCalendarType, this.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate(), oLocale, vCalendarWeekNumbering);
 };
 UniversalDate.prototype.setUTCWeek = function (oWeek, oLocale, vCalendarWeekNumbering) {
-    checkWeekConfig(vCalendarWeekNumbering);
     var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week, oLocale, vCalendarWeekNumbering);
     this.setUTCFullYear(oDate.year, oDate.month, oDate.day);
 };
@@ -172,6 +169,7 @@ UniversalDate.prototype.getTimezoneLong = function () {
 };
 var iMillisecondsInWeek = 7 * 24 * 60 * 60 * 1000;
 UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay, oLocale, vCalendarWeekNumbering) {
+    vCalendarWeekNumbering = vCalendarWeekNumbering || Configuration.getCalendarWeekNumbering();
     checkWeekConfig(vCalendarWeekNumbering);
     oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
     var clDate = this.getClass(sCalendarType);
@@ -202,6 +200,7 @@ UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay, oLoc
     };
 };
 UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek, oLocale, vCalendarWeekNumbering) {
+    vCalendarWeekNumbering = vCalendarWeekNumbering || Configuration.getCalendarWeekNumbering();
     checkWeekConfig(vCalendarWeekNumbering);
     oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
     var clDate = this.getClass(sCalendarType);
@@ -222,27 +221,18 @@ UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek, oLocal
     };
 };
 function isSplitWeek(vCalendarWeekNumbering, oLocale) {
-    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
     var oLocaleData = LocaleData.getInstance(oLocale);
-    return (!isCalendarWeekConfigurationDefined(vCalendarWeekNumbering) || vCalendarWeekNumbering === CalendarWeekNumbering.Default) && oLocaleData.firstDayStartsFirstWeek();
+    return (vCalendarWeekNumbering === CalendarWeekNumbering.Default || vCalendarWeekNumbering === CalendarWeekNumbering.WesternTraditional) && oLocaleData.firstDayStartsFirstWeek();
 }
 function checkWeekConfig(vCalendarWeekNumbering) {
     if (typeof vCalendarWeekNumbering === 'object') {
-        if (!isCalendarWeekConfigurationDefined(vCalendarWeekNumbering)) {
+        if (typeof vCalendarWeekNumbering.firstDayOfWeek !== 'number' || typeof vCalendarWeekNumbering.minimalDaysInFirstWeek !== 'number') {
             throw new TypeError('Week config requires firstDayOfWeek and minimalDaysInFirstWeek to be set');
         }
-    } else if (vCalendarWeekNumbering && !Object.values(CalendarWeekNumbering).includes(vCalendarWeekNumbering)) {
+    } else if (!Object.values(CalendarWeekNumbering).includes(vCalendarWeekNumbering)) {
         throw new TypeError('Illegal format option calendarWeekNumbering: \'' + vCalendarWeekNumbering + '\'');
     }
 }
-function isCalendarWeekConfigurationDefined(vCalendarWeekNumbering) {
-    if (typeof vCalendarWeekNumbering === 'object') {
-        return typeof vCalendarWeekNumbering.firstDayOfWeek === 'number' && typeof vCalendarWeekNumbering.minimalDaysInFirstWeek === 'number';
-    } else if (vCalendarWeekNumbering) {
-        return true;
-    }
-    return false;
-}
 function resolveCalendarWeekConfiguration(vCalendarWeekNumbering, oLocale) {
     if (typeof vCalendarWeekNumbering === 'object' && typeof vCalendarWeekNumbering.firstDayOfWeek === 'number' && typeof vCalendarWeekNumbering.minimalDaysInFirstWeek === 'number') {
         return vCalendarWeekNumbering;
@@ -288,7 +278,7 @@ UniversalDate.getEraByDate = function (sCalendarType, iYear, iMonth, iDay) {
     }
 };
 UniversalDate.getCurrentEra = function (sCalendarType) {
-    var oNow = new Date();
+    var oNow = UI5Date.getInstance();
     return this.getEraByDate(sCalendarType, oNow.getFullYear(), oNow.getMonth(), oNow.getDate());
 };
 UniversalDate.getEraStartDate = function (sCalendarType, iEra) {