@ui5/webcomponents-localization 0.0.0-dff5837d7 → 0.0.0-e818f286e

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

@@ -20,7 +20,7 @@ UniversalDate.prototype.createDate = function (clDate, aArgs) {
     case 0:
         return new clDate();
     case 1:
-        return new clDate(aArgs[0]);
+        return new clDate(aArgs[0] instanceof Date ? aArgs[0].getTime() : aArgs[0]);
     case 2:
         return new clDate(aArgs[0], aArgs[1]);
     case 3:
@@ -39,6 +39,11 @@ 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())) {
+        throw new Error('The given date object is invalid');
     }
     if (!sCalendarType) {
         sCalendarType = Core.getConfiguration().getCalendarType();
@@ -160,8 +165,8 @@ UniversalDate.prototype.getTimezoneLong = function () {
 };
 var iMillisecondsInWeek = 7 * 24 * 60 * 60 * 1000;
 UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(clDate.UTC(iYear, iMonth, iDay)), iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
-    if (oLocale.getRegion() === 'US') {
+    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(clDate.UTC(iYear, iMonth, iDay)), iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
+    if (oLocaleData.firstDayStartsFirstWeek()) {
         iWeek = calculateWeeks(oFirstDay, oDate);
     } else {
         iLastYear = iYear - 1;
@@ -184,8 +189,8 @@ UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
     };
 };
 UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek);
-    if (oLocale.getRegion() === 'US' && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
+    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek), bIsRegionUS = oLocaleData.firstDayStartsFirstWeek();
+    if (bIsRegionUS && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
         return {
             year: iYear,
             month: 0,
@@ -200,6 +205,9 @@ UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek) {
 };
 function getFirstDayOfFirstWeek(clDate, iYear) {
     var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), iMinDays = oLocaleData.getMinimalDaysInFirstWeek(), iFirstDayOfWeek = oLocaleData.getFirstDayOfWeek(), oFirstDay = new clDate(clDate.UTC(iYear, 0, 1)), iDayCount = 7;
+    if (isNaN(oFirstDay.getTime())) {
+        throw new Error('Could not determine the first day of the week, because the date ' + 'object is invalid');
+    }
     while (oFirstDay.getUTCDay() !== iFirstDayOfWeek) {
         oFirstDay.setUTCDate(oFirstDay.getUTCDate() - 1);
         iDayCount--;