@openui5/sap.ui.unified 1.112.2 → 1.113.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/THIRDPARTY.txt +1 -1
- package/package.json +2 -2
- package/src/sap/ui/unified/.library +1 -1
- package/src/sap/ui/unified/Calendar.js +51 -59
- package/src/sap/ui/unified/CalendarAppointment.js +1 -1
- package/src/sap/ui/unified/CalendarDateInterval.js +6 -3
- package/src/sap/ui/unified/CalendarLegend.js +1 -1
- package/src/sap/ui/unified/CalendarLegendItem.js +1 -1
- package/src/sap/ui/unified/CalendarMonthInterval.js +8 -2
- package/src/sap/ui/unified/CalendarOneMonthInterval.js +1 -1
- package/src/sap/ui/unified/CalendarRow.js +5 -2
- package/src/sap/ui/unified/CalendarTimeInterval.js +8 -2
- package/src/sap/ui/unified/CalendarWeekInterval.js +1 -1
- package/src/sap/ui/unified/ColorPicker.js +1 -1
- package/src/sap/ui/unified/ColorPickerPopover.js +1 -1
- package/src/sap/ui/unified/ContentSwitcher.js +1 -1
- package/src/sap/ui/unified/Currency.js +1 -1
- package/src/sap/ui/unified/CurrencyRenderer.js +1 -1
- package/src/sap/ui/unified/DateRange.js +5 -1
- package/src/sap/ui/unified/DateTypeRange.js +1 -1
- package/src/sap/ui/unified/FileUploader.js +1 -1
- package/src/sap/ui/unified/FileUploaderParameter.js +1 -1
- package/src/sap/ui/unified/FileUploaderXHRSettings.js +1 -1
- package/src/sap/ui/unified/Menu.js +1 -1
- package/src/sap/ui/unified/MenuItem.js +1 -1
- package/src/sap/ui/unified/MenuItemBase.js +1 -1
- package/src/sap/ui/unified/MenuRenderer.js +1 -1
- package/src/sap/ui/unified/MenuTextFieldItem.js +1 -1
- package/src/sap/ui/unified/Shell.js +1 -1
- package/src/sap/ui/unified/ShellHeadItem.js +1 -1
- package/src/sap/ui/unified/ShellHeadUserItem.js +1 -1
- package/src/sap/ui/unified/ShellLayout.js +1 -1
- package/src/sap/ui/unified/ShellOverlay.js +1 -1
- package/src/sap/ui/unified/SplitContainer.js +1 -1
- package/src/sap/ui/unified/calendar/DatesRow.js +7 -3
- package/src/sap/ui/unified/calendar/Header.js +1 -1
- package/src/sap/ui/unified/calendar/IndexPicker.js +1 -1
- package/src/sap/ui/unified/calendar/Month.js +62 -55
- package/src/sap/ui/unified/calendar/MonthPicker.js +34 -29
- package/src/sap/ui/unified/calendar/MonthsRow.js +15 -11
- package/src/sap/ui/unified/calendar/OneMonthDatesRow.js +1 -1
- package/src/sap/ui/unified/calendar/TimesRow.js +7 -3
- package/src/sap/ui/unified/calendar/YearPicker.js +56 -46
- package/src/sap/ui/unified/calendar/YearRangePicker.js +11 -11
- package/src/sap/ui/unified/designtime/messagebundle_uk.properties +2 -2
- package/src/sap/ui/unified/library.js +2 -2
package/THIRDPARTY.txt
CHANGED
|
@@ -478,7 +478,7 @@ License: Apache-2.0
|
|
|
478
478
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
|
|
479
479
|
Contained in: lib/jsdoc/ui5/plugin.js
|
|
480
480
|
|
|
481
|
-
Component: SAP Theming Base Content, version: 11.1
|
|
481
|
+
Component: SAP Theming Base Content, version: 11.2.1
|
|
482
482
|
Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
|
|
483
483
|
License: Apache-2.0
|
|
484
484
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.unified",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.113.0",
|
|
4
4
|
"description": "OpenUI5 UI Library sap.ui.unified",
|
|
5
5
|
"author": "SAP SE (https://www.sap.com)",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -14,6 +14,6 @@
|
|
|
14
14
|
"url": "https://github.com/SAP/openui5.git"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@openui5/sap.ui.core": "1.
|
|
17
|
+
"@openui5/sap.ui.core": "1.113.0"
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<copyright>OpenUI5
|
|
7
7
|
* (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
|
|
8
8
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
|
|
9
|
-
<version>1.
|
|
9
|
+
<version>1.113.0</version>
|
|
10
10
|
|
|
11
11
|
<documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
|
|
12
12
|
|
|
@@ -76,7 +76,7 @@ sap.ui.define([
|
|
|
76
76
|
* Basic Calendar.
|
|
77
77
|
* This calendar is used for DatePickers
|
|
78
78
|
* @extends sap.ui.core.Control
|
|
79
|
-
* @version 1.
|
|
79
|
+
* @version 1.113.0
|
|
80
80
|
*
|
|
81
81
|
* @constructor
|
|
82
82
|
* @public
|
|
@@ -138,14 +138,14 @@ sap.ui.define([
|
|
|
138
138
|
* If not set, the calendar type of the global configuration is used.
|
|
139
139
|
* @since 1.34.0
|
|
140
140
|
*/
|
|
141
|
-
primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance"
|
|
141
|
+
primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance"},
|
|
142
142
|
|
|
143
143
|
/**
|
|
144
144
|
* If set, the days are also displayed in this calendar type
|
|
145
145
|
* If not set, the dates are only displayed in the primary calendar type
|
|
146
146
|
* @since 1.34.0
|
|
147
147
|
*/
|
|
148
|
-
secondaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance"
|
|
148
|
+
secondaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance"},
|
|
149
149
|
|
|
150
150
|
/**
|
|
151
151
|
* Width of Calendar
|
|
@@ -349,11 +349,6 @@ sap.ui.define([
|
|
|
349
349
|
this._iBreakPointDesktop = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[1];
|
|
350
350
|
this._iBreakPointLargeDesktop = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[2];
|
|
351
351
|
|
|
352
|
-
// set default calendar type from configuration
|
|
353
|
-
var sCalendarType = Configuration.getCalendarType();
|
|
354
|
-
this.setProperty("primaryCalendarType", sCalendarType);
|
|
355
|
-
this.setProperty("secondaryCalendarType", sCalendarType);
|
|
356
|
-
|
|
357
352
|
this._iColumns = 1; // default columns for the calendar
|
|
358
353
|
|
|
359
354
|
// Render the monthPicker first to get the length of the current month name. The _currentPicker property will
|
|
@@ -361,12 +356,12 @@ sap.ui.define([
|
|
|
361
356
|
this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH_PICKER);
|
|
362
357
|
|
|
363
358
|
// to format year with era in Japanese
|
|
364
|
-
this._oYearFormat = DateFormat.getDateInstance({format: "y", calendarType:
|
|
359
|
+
this._oYearFormat = DateFormat.getDateInstance({format: "y", calendarType: this._getPrimaryCalendarType()});
|
|
365
360
|
|
|
366
361
|
this.data("sap-ui-fastnavgroup", "true", true); // Define group for F6 handling
|
|
367
362
|
|
|
368
|
-
this._oMinDate = CalendarUtils._minDate(this.
|
|
369
|
-
this._oMaxDate = CalendarUtils._maxDate(this.
|
|
363
|
+
this._oMinDate = CalendarUtils._minDate(this._getPrimaryCalendarType());
|
|
364
|
+
this._oMaxDate = CalendarUtils._maxDate(this._getPrimaryCalendarType());
|
|
370
365
|
|
|
371
366
|
this._initializeHeader();
|
|
372
367
|
this._initializeSecondMonthHeader();
|
|
@@ -489,7 +484,7 @@ sap.ui.define([
|
|
|
489
484
|
Calendar.prototype._initializeYearRangePicker = function() {
|
|
490
485
|
var oYearRangePicker = new YearRangePicker(this.getId() + "--YRP");
|
|
491
486
|
oYearRangePicker.attachEvent("select", this._selectYearRange, this);
|
|
492
|
-
oYearRangePicker.setPrimaryCalendarType(this.
|
|
487
|
+
oYearRangePicker.setPrimaryCalendarType(this._getPrimaryCalendarType());
|
|
493
488
|
this.setAggregation("yearRangePicker", oYearRangePicker); // do not invalidate
|
|
494
489
|
};
|
|
495
490
|
|
|
@@ -509,7 +504,7 @@ sap.ui.define([
|
|
|
509
504
|
weekDays: oWeekDays
|
|
510
505
|
});
|
|
511
506
|
|
|
512
|
-
this._focusDate(CalendarDate.fromLocalJSDate(oWeekDays.getStartDate(), this.
|
|
507
|
+
this._focusDate(CalendarDate.fromLocalJSDate(oWeekDays.getStartDate(), this._getPrimaryCalendarType()), true, false, false);
|
|
513
508
|
|
|
514
509
|
if (!bExecuteDefault) {
|
|
515
510
|
oEvent.preventDefault();
|
|
@@ -542,7 +537,7 @@ sap.ui.define([
|
|
|
542
537
|
|
|
543
538
|
if (aMonths.length > 1 && oMonthDate) {
|
|
544
539
|
// for more than one month - re-render same months (if already rendered once)
|
|
545
|
-
oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this.
|
|
540
|
+
oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this._getPrimaryCalendarType());
|
|
546
541
|
} else if (aMonths.length > 1) {
|
|
547
542
|
oCalDate = _determineFirstMonthDate.call(this, this._getFocusedDate());
|
|
548
543
|
} else {
|
|
@@ -735,7 +730,7 @@ sap.ui.define([
|
|
|
735
730
|
*/
|
|
736
731
|
Calendar.prototype._setFocusedDate = function(oDate){
|
|
737
732
|
CalendarUtils._checkCalendarDate(oDate);
|
|
738
|
-
this._oFocusedDate = new CalendarDate(oDate, this.
|
|
733
|
+
this._oFocusedDate = new CalendarDate(oDate, this._getPrimaryCalendarType());
|
|
739
734
|
};
|
|
740
735
|
|
|
741
736
|
/**
|
|
@@ -786,7 +781,7 @@ sap.ui.define([
|
|
|
786
781
|
if (this.getDomRef()) {
|
|
787
782
|
// if rendered just use the date of the first month
|
|
788
783
|
var aMonths = this.getAggregation("month");
|
|
789
|
-
oStartDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this.
|
|
784
|
+
oStartDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this._getPrimaryCalendarType());
|
|
790
785
|
} else {
|
|
791
786
|
// if not rendered use the focused date
|
|
792
787
|
oStartDate = new CalendarDate(this._getFocusedDate());
|
|
@@ -897,7 +892,6 @@ sap.ui.define([
|
|
|
897
892
|
|
|
898
893
|
Calendar.prototype.setSecondaryCalendarType = function(sCalendarType){
|
|
899
894
|
|
|
900
|
-
this._bSecondaryCalendarTypeSet = true; // as property can not be empty but we use it only if set
|
|
901
895
|
this.setProperty("secondaryCalendarType", sCalendarType);
|
|
902
896
|
|
|
903
897
|
this._oYearFormatSecondary = DateFormat.getDateInstance({format: "y", calendarType: sCalendarType});
|
|
@@ -917,24 +911,22 @@ sap.ui.define([
|
|
|
917
911
|
|
|
918
912
|
};
|
|
919
913
|
|
|
914
|
+
Calendar.prototype._getPrimaryCalendarType = function(){
|
|
915
|
+
return this.getProperty("primaryCalendarType") || Configuration.getCalendarType();
|
|
916
|
+
};
|
|
917
|
+
|
|
920
918
|
/**
|
|
921
919
|
* Returns if there is secondary calendar type set and if it is different from the primary one.
|
|
922
|
-
* @returns {
|
|
920
|
+
* @returns {string} if there is secondary calendar type set and if it is different from the primary one
|
|
923
921
|
*/
|
|
924
922
|
Calendar.prototype._getSecondaryCalendarType = function(){
|
|
923
|
+
var sSecondaryCalendarType = this.getSecondaryCalendarType();
|
|
925
924
|
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
if (this._bSecondaryCalendarTypeSet) {
|
|
929
|
-
sSecondaryCalendarType = this.getSecondaryCalendarType();
|
|
930
|
-
var sPrimaryCalendarType = this.getPrimaryCalendarType();
|
|
931
|
-
if (sSecondaryCalendarType == sPrimaryCalendarType) {
|
|
932
|
-
sSecondaryCalendarType = undefined;
|
|
933
|
-
}
|
|
925
|
+
if (sSecondaryCalendarType === this._getPrimaryCalendarType()) {
|
|
926
|
+
return undefined;
|
|
934
927
|
}
|
|
935
928
|
|
|
936
929
|
return sSecondaryCalendarType;
|
|
937
|
-
|
|
938
930
|
};
|
|
939
931
|
|
|
940
932
|
/**
|
|
@@ -970,7 +962,7 @@ sap.ui.define([
|
|
|
970
962
|
*/
|
|
971
963
|
Calendar.prototype.setMinDate = function(oDate){
|
|
972
964
|
var aMonths = this.getAggregation("month"),
|
|
973
|
-
sPrimaryCalendarType = this.
|
|
965
|
+
sPrimaryCalendarType = this._getPrimaryCalendarType(),
|
|
974
966
|
iMinYear;
|
|
975
967
|
|
|
976
968
|
if (deepEqual(oDate, this.getMinDate())) {
|
|
@@ -1025,7 +1017,7 @@ sap.ui.define([
|
|
|
1025
1017
|
Calendar.prototype.setMaxDate = function(oDate){
|
|
1026
1018
|
|
|
1027
1019
|
var aMonths = this.getAggregation("month"),
|
|
1028
|
-
sPrimaryCalendarType = this.
|
|
1020
|
+
sPrimaryCalendarType = this._getPrimaryCalendarType(),
|
|
1029
1021
|
iMaxYear;
|
|
1030
1022
|
|
|
1031
1023
|
if (deepEqual(oDate, this.getMaxDate())) {
|
|
@@ -1295,7 +1287,7 @@ sap.ui.define([
|
|
|
1295
1287
|
|
|
1296
1288
|
var oCalDate;
|
|
1297
1289
|
if (aMonths.length > 1) {
|
|
1298
|
-
oCalDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this.
|
|
1290
|
+
oCalDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this._getPrimaryCalendarType());
|
|
1299
1291
|
} else {
|
|
1300
1292
|
oCalDate = this._getFocusedDate();
|
|
1301
1293
|
}
|
|
@@ -1351,7 +1343,7 @@ sap.ui.define([
|
|
|
1351
1343
|
var oHeader = this.getAggregation("header");
|
|
1352
1344
|
var iMonths = _getMonths.call(this);
|
|
1353
1345
|
|
|
1354
|
-
var oCheckDate = new CalendarDate(oDate, this.
|
|
1346
|
+
var oCheckDate = new CalendarDate(oDate, this._getPrimaryCalendarType());
|
|
1355
1347
|
|
|
1356
1348
|
if (this._iMode === 1 && iMonths > 1) {
|
|
1357
1349
|
oCheckDate = _determineFirstMonthDate.call(this, oDate);
|
|
@@ -1403,7 +1395,7 @@ sap.ui.define([
|
|
|
1403
1395
|
Calendar.prototype._togglePrevNexYearPicker = function(){
|
|
1404
1396
|
var oYearRangePicker = this.getAggregation("yearRangePicker"),
|
|
1405
1397
|
oYearPicker = this._getYearPicker(),
|
|
1406
|
-
sPrimaryType = this.
|
|
1398
|
+
sPrimaryType = this._getPrimaryCalendarType(),
|
|
1407
1399
|
oMinDate = new CalendarDate(this._oMinDate, sPrimaryType),
|
|
1408
1400
|
oMaxDate = new CalendarDate(this._oMaxDate, sPrimaryType),
|
|
1409
1401
|
oHeader = this.getAggregation("header"),
|
|
@@ -1452,7 +1444,7 @@ sap.ui.define([
|
|
|
1452
1444
|
switch (this._iMode) {
|
|
1453
1445
|
case 0: // day picker
|
|
1454
1446
|
if (iMonths > 1) {
|
|
1455
|
-
oFirstMonthDate = CalendarDate.fromLocalJSDate(this.getAggregation("month")[0].getDate(), this.
|
|
1447
|
+
oFirstMonthDate = CalendarDate.fromLocalJSDate(this.getAggregation("month")[0].getDate(), this._getPrimaryCalendarType());
|
|
1456
1448
|
oFirstMonthDate.setDate(1);
|
|
1457
1449
|
this._setFocusedDate(oFirstMonthDate);
|
|
1458
1450
|
oFocusedDate = this._getFocusedDate();
|
|
@@ -1511,7 +1503,7 @@ sap.ui.define([
|
|
|
1511
1503
|
switch (this._iMode) {
|
|
1512
1504
|
case 0: // day picker
|
|
1513
1505
|
if (iMonths > 1) {
|
|
1514
|
-
oFirstMonthDate = CalendarDate.fromLocalJSDate(this.getAggregation("month")[0].getDate(), this.
|
|
1506
|
+
oFirstMonthDate = CalendarDate.fromLocalJSDate(this.getAggregation("month")[0].getDate(), this._getPrimaryCalendarType());
|
|
1515
1507
|
oFirstMonthDate.setMonth(oFirstMonthDate.getMonth(),1);
|
|
1516
1508
|
this._setFocusedDate(oFirstMonthDate);
|
|
1517
1509
|
oFocusedDate = this._getFocusedDate();
|
|
@@ -1629,7 +1621,7 @@ sap.ui.define([
|
|
|
1629
1621
|
|
|
1630
1622
|
Calendar.prototype._getDisplayedSecondaryMonths = function(){
|
|
1631
1623
|
|
|
1632
|
-
var sPrimaryCalendarType = this.
|
|
1624
|
+
var sPrimaryCalendarType = this._getPrimaryCalendarType(),
|
|
1633
1625
|
sSecondaryCalendarType = this._getSecondaryCalendarType(),
|
|
1634
1626
|
aMonths = this.getAggregation("month"),
|
|
1635
1627
|
oFirstDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), sPrimaryCalendarType),
|
|
@@ -1654,7 +1646,7 @@ sap.ui.define([
|
|
|
1654
1646
|
* @returns {object} two values - start and end date
|
|
1655
1647
|
*/
|
|
1656
1648
|
Calendar.prototype._getDisplayedSecondaryYears = function(){
|
|
1657
|
-
var sPrimaryCalendarType = this.
|
|
1649
|
+
var sPrimaryCalendarType = this._getPrimaryCalendarType(),
|
|
1658
1650
|
sSecondaryCalendarType = this._getSecondaryCalendarType(),
|
|
1659
1651
|
oFirstDate, oLastDate, oFocusedDate, oDate, aMonths, oYearPicker, iHalfRange;
|
|
1660
1652
|
switch (this._iMode) {
|
|
@@ -1746,7 +1738,7 @@ sap.ui.define([
|
|
|
1746
1738
|
*/
|
|
1747
1739
|
Calendar.prototype._handleFocus = function (oEvent) {
|
|
1748
1740
|
|
|
1749
|
-
var oDate = CalendarDate.fromLocalJSDate(oEvent.getParameter("date"), this.
|
|
1741
|
+
var oDate = CalendarDate.fromLocalJSDate(oEvent.getParameter("date"), this._getPrimaryCalendarType()),
|
|
1750
1742
|
bOtherMonth = oEvent.getParameter("otherMonth"),
|
|
1751
1743
|
bRestoreOldDate = oEvent.getParameter("restoreOldDate");
|
|
1752
1744
|
|
|
@@ -1787,14 +1779,14 @@ sap.ui.define([
|
|
|
1787
1779
|
aMonths = this.getAggregation("month"),
|
|
1788
1780
|
oMonth,
|
|
1789
1781
|
oMonthDate,
|
|
1790
|
-
oFirstDate = _determineFirstMonthDate.call(this, new CalendarDate(oDate, this.
|
|
1782
|
+
oFirstDate = _determineFirstMonthDate.call(this, new CalendarDate(oDate, this._getPrimaryCalendarType())),
|
|
1791
1783
|
i = 0,
|
|
1792
1784
|
bMonthContainsDate = aMonths[0].checkDateFocusable(oDate.toLocalJSDate()),
|
|
1793
1785
|
bFireStartDateChange = !bNoEvent && !bMonthContainsDate;
|
|
1794
1786
|
|
|
1795
1787
|
for (i = 0; i < aMonths.length; i++) {
|
|
1796
1788
|
oMonth = aMonths[i];
|
|
1797
|
-
oMonthDate = new CalendarDate(oFirstDate, this.
|
|
1789
|
+
oMonthDate = new CalendarDate(oFirstDate, this._getPrimaryCalendarType());
|
|
1798
1790
|
oMonthDate.setMonth(oFirstDate.getMonth() + i);
|
|
1799
1791
|
if (!bSkipFocus && CalendarUtils._isSameMonthAndYear(oMonthDate, oDate)) {
|
|
1800
1792
|
oMonth.setDate(oDate.toLocalJSDate());
|
|
@@ -1997,7 +1989,7 @@ sap.ui.define([
|
|
|
1997
1989
|
var sText;
|
|
1998
1990
|
var sYear;
|
|
1999
1991
|
var sPattern;
|
|
2000
|
-
var sPrimaryCalendarType = this.
|
|
1992
|
+
var sPrimaryCalendarType = this._getPrimaryCalendarType();
|
|
2001
1993
|
var sSecondaryCalendarType = this._getSecondaryCalendarType();
|
|
2002
1994
|
var sSecondaryMonthInfo = "";
|
|
2003
1995
|
|
|
@@ -2109,7 +2101,7 @@ sap.ui.define([
|
|
|
2109
2101
|
|
|
2110
2102
|
if (aMonths.length > 1 && oMonthDate) {
|
|
2111
2103
|
// for more than one month - re-render same months (if already rendered once)
|
|
2112
|
-
oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this.
|
|
2104
|
+
oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this._getPrimaryCalendarType());
|
|
2113
2105
|
} else if (aMonths.length > 1) {
|
|
2114
2106
|
oCalDate = _determineFirstMonthDate.call(this, this._getFocusedDate());
|
|
2115
2107
|
} else {
|
|
@@ -2138,11 +2130,11 @@ sap.ui.define([
|
|
|
2138
2130
|
};
|
|
2139
2131
|
|
|
2140
2132
|
Calendar.prototype._selectMonth = function () {
|
|
2141
|
-
var oFocusedDate = new CalendarDate(this._getFocusedDate(), this.
|
|
2133
|
+
var oFocusedDate = new CalendarDate(this._getFocusedDate(), this._getPrimaryCalendarType()),
|
|
2142
2134
|
oMonthPicker = this._getMonthPicker(),
|
|
2143
2135
|
iFocusedMonth = oMonthPicker.getProperty("_focusedMonth"),
|
|
2144
2136
|
iMonth = (iFocusedMonth || iFocusedMonth === 0) ? iFocusedMonth : oMonthPicker.getMonth(),
|
|
2145
|
-
oSecondCalDate = CalendarDate.fromLocalJSDate(UI5Date.getInstance(), this.
|
|
2137
|
+
oSecondCalDate = CalendarDate.fromLocalJSDate(UI5Date.getInstance(), this._getPrimaryCalendarType());
|
|
2146
2138
|
|
|
2147
2139
|
oSecondCalDate = oMonthPicker._iYear ?
|
|
2148
2140
|
oSecondCalDate
|
|
@@ -2151,10 +2143,10 @@ sap.ui.define([
|
|
|
2151
2143
|
new CalendarDate(this._getFocusedDate().getYear(), iMonth - 1, 1);
|
|
2152
2144
|
|
|
2153
2145
|
if (_getMonths.call(this) > 1) {
|
|
2154
|
-
if (this._bActionTriggeredFromSecondHeader && oSecondCalDate.getYear() >= CalendarUtils._minDate(this.
|
|
2146
|
+
if (this._bActionTriggeredFromSecondHeader && oSecondCalDate.getYear() >= CalendarUtils._minDate(this._getPrimaryCalendarType()).getYear()) {
|
|
2155
2147
|
oFocusedDate.setYear(oSecondCalDate.getYear());
|
|
2156
2148
|
iMonth = oSecondCalDate.getMonth();
|
|
2157
|
-
} else if (oFocusedDate.getYear() === CalendarUtils._maxDate(this.
|
|
2149
|
+
} else if (oFocusedDate.getYear() === CalendarUtils._maxDate(this._getPrimaryCalendarType()).getYear() && iMonth === 11) {
|
|
2158
2150
|
iMonth -= 1;
|
|
2159
2151
|
}
|
|
2160
2152
|
}
|
|
@@ -2187,10 +2179,10 @@ sap.ui.define([
|
|
|
2187
2179
|
* @returns {void}
|
|
2188
2180
|
*/
|
|
2189
2181
|
Calendar.prototype._selectYear = function () {
|
|
2190
|
-
var oFocusedDate = new CalendarDate(this._getFocusedDate(), this.
|
|
2182
|
+
var oFocusedDate = new CalendarDate(this._getFocusedDate(), this._getPrimaryCalendarType()),
|
|
2191
2183
|
oFocusedMonth = oFocusedDate.getMonth(),
|
|
2192
2184
|
oYearPicker = this._getYearPicker(),
|
|
2193
|
-
oDate = CalendarDate.fromLocalJSDate(oYearPicker.getDate(), this.
|
|
2185
|
+
oDate = CalendarDate.fromLocalJSDate(oYearPicker.getDate(), this._getPrimaryCalendarType());
|
|
2194
2186
|
|
|
2195
2187
|
// to keep day and month stable also for islamic date
|
|
2196
2188
|
if (!this._bActionTriggeredFromSecondHeader){
|
|
@@ -2231,7 +2223,7 @@ sap.ui.define([
|
|
|
2231
2223
|
var oYearRangePicker = this.getAggregation("yearRangePicker"),
|
|
2232
2224
|
oHeader = this.getAggregation("header"),
|
|
2233
2225
|
iRangeSize = oYearRangePicker.getRangeSize(),
|
|
2234
|
-
sPrimaryCalendarType = this.
|
|
2226
|
+
sPrimaryCalendarType = this._getPrimaryCalendarType(),
|
|
2235
2227
|
oStartDate = CalendarDate.fromLocalJSDate(oYearRangePicker.getDate(), sPrimaryCalendarType),
|
|
2236
2228
|
oEndDate = new CalendarDate(oStartDate.getYear() + iRangeSize - 1, 0, 1, sPrimaryCalendarType),
|
|
2237
2229
|
oFocusedDate = this._getFocusedDate(),
|
|
@@ -2240,9 +2232,9 @@ sap.ui.define([
|
|
|
2240
2232
|
oFocusedDate.setYear(oStartDate.getYear() + iRangeSize / 2);
|
|
2241
2233
|
oStartDate.setMonth(0, 1); // always use the first of the month to have stable year in Japanese calendar
|
|
2242
2234
|
if (oFocusedDate.isBefore(this._oMinDate)) {
|
|
2243
|
-
oFocusedDate = new CalendarDate(this._oMinDate, this.
|
|
2235
|
+
oFocusedDate = new CalendarDate(this._oMinDate, this._getPrimaryCalendarType());
|
|
2244
2236
|
} else if (oFocusedDate.isAfter(this._oMaxDate)){
|
|
2245
|
-
oFocusedDate = new CalendarDate(this._oMaxDate, this.
|
|
2237
|
+
oFocusedDate = new CalendarDate(this._oMaxDate, this._getPrimaryCalendarType());
|
|
2246
2238
|
}
|
|
2247
2239
|
this._setFocusedDate(oFocusedDate);
|
|
2248
2240
|
|
|
@@ -2259,7 +2251,7 @@ sap.ui.define([
|
|
|
2259
2251
|
Calendar.prototype._showYearRangePicker = function () {
|
|
2260
2252
|
var oYearRangePicker = this.getAggregation("yearRangePicker"),
|
|
2261
2253
|
oYearPicker = this._getYearPicker(),
|
|
2262
|
-
oRangeMidDate = CalendarDate.fromLocalJSDate(oYearPicker.getFirstRenderedDate(), this.
|
|
2254
|
+
oRangeMidDate = CalendarDate.fromLocalJSDate(oYearPicker.getFirstRenderedDate(), this._getPrimaryCalendarType());
|
|
2263
2255
|
|
|
2264
2256
|
this.setProperty("_currentPicker", CURRENT_PICKERS.YEAR_RANGE_PICKER);
|
|
2265
2257
|
|
|
@@ -2443,14 +2435,14 @@ sap.ui.define([
|
|
|
2443
2435
|
oSecondMonthHeader = this.getAggregation("secondMonthHeader"),
|
|
2444
2436
|
sFirstHeaderText = sFirstHeaderYear,
|
|
2445
2437
|
sSecondHeaderText = sSecondHeaderYear || sFirstHeaderYear,
|
|
2446
|
-
sPrimaryCalendarType = this.
|
|
2438
|
+
sPrimaryCalendarType = this._getPrimaryCalendarType();
|
|
2447
2439
|
|
|
2448
2440
|
if (this._iMode === 2 && oYearPicker) {
|
|
2449
2441
|
|
|
2450
2442
|
var oDate = oYearPicker.getProperty("_middleDate") ? oYearPicker.getProperty("_middleDate") : oYearPicker._getDate(),
|
|
2451
2443
|
oFirstDate = new CalendarDate(oDate, sPrimaryCalendarType),
|
|
2452
|
-
oMinYear = CalendarUtils._minDate(this.
|
|
2453
|
-
oMaxYear = CalendarUtils._maxDate(this.
|
|
2444
|
+
oMinYear = CalendarUtils._minDate(this._getPrimaryCalendarType()).getYear(),
|
|
2445
|
+
oMaxYear = CalendarUtils._maxDate(this._getPrimaryCalendarType()).getYear(),
|
|
2454
2446
|
oSecondDate,
|
|
2455
2447
|
sFirstYear,
|
|
2456
2448
|
sSecondYear;
|
|
@@ -2495,7 +2487,7 @@ sap.ui.define([
|
|
|
2495
2487
|
Calendar.prototype._adjustYearRangeDisplay = function() {
|
|
2496
2488
|
var oYearRangePicker = this.getAggregation("yearRangePicker"),
|
|
2497
2489
|
sLang = sap.ui.getCore().getConfiguration().getLanguage().toLocaleLowerCase(),
|
|
2498
|
-
sPrimaryCalendarType = this.
|
|
2490
|
+
sPrimaryCalendarType = this._getPrimaryCalendarType();
|
|
2499
2491
|
|
|
2500
2492
|
if (!this._getSucessorsPickerPopup()) {
|
|
2501
2493
|
// An evaluation about the count of year cells that could fit in the sap.ui.unified.calendar.YearRangePicker
|
|
@@ -2547,7 +2539,7 @@ sap.ui.define([
|
|
|
2547
2539
|
function _determineFocusedDate(){
|
|
2548
2540
|
|
|
2549
2541
|
var aSelectedDates = this.getSelectedDates();
|
|
2550
|
-
var sCalendarType = this.
|
|
2542
|
+
var sCalendarType = this._getPrimaryCalendarType();
|
|
2551
2543
|
if (aSelectedDates && aSelectedDates[0] && aSelectedDates[0].getStartDate()) {
|
|
2552
2544
|
// selected dates are provided -> use first one to focus
|
|
2553
2545
|
this._oFocusedDate = CalendarDate.fromLocalJSDate(aSelectedDates[0].getStartDate(), sCalendarType);
|
|
@@ -2666,7 +2658,7 @@ sap.ui.define([
|
|
|
2666
2658
|
*/
|
|
2667
2659
|
function _determineFirstMonthDate(oDate){
|
|
2668
2660
|
|
|
2669
|
-
var oFirstDate = new CalendarDate(oDate, this.
|
|
2661
|
+
var oFirstDate = new CalendarDate(oDate, this._getPrimaryCalendarType());
|
|
2670
2662
|
oFirstDate.setDate(1);
|
|
2671
2663
|
|
|
2672
2664
|
var iMonths = _getMonths.call(this); // to use validation
|
|
@@ -2704,7 +2696,7 @@ sap.ui.define([
|
|
|
2704
2696
|
oDate;
|
|
2705
2697
|
|
|
2706
2698
|
if (aMonths.length > 1) {
|
|
2707
|
-
oDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this.
|
|
2699
|
+
oDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this._getPrimaryCalendarType());
|
|
2708
2700
|
} else {
|
|
2709
2701
|
oDate = this._getFocusedDate();
|
|
2710
2702
|
}
|
|
@@ -2725,7 +2717,7 @@ sap.ui.define([
|
|
|
2725
2717
|
function _displayDate(oDate, bSkipFocus) {
|
|
2726
2718
|
|
|
2727
2719
|
var oCalDate,
|
|
2728
|
-
sPrimaryCalendarType = this.
|
|
2720
|
+
sPrimaryCalendarType = this._getPrimaryCalendarType(),
|
|
2729
2721
|
iYear;
|
|
2730
2722
|
|
|
2731
2723
|
if (!oDate) {
|
|
@@ -59,7 +59,7 @@ sap.ui.define([
|
|
|
59
59
|
* @class
|
|
60
60
|
* <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
|
|
61
61
|
* @extends sap.ui.unified.Calendar
|
|
62
|
-
* @version 1.
|
|
62
|
+
* @version 1.113.0
|
|
63
63
|
*
|
|
64
64
|
* @constructor
|
|
65
65
|
* @public
|
|
@@ -412,9 +412,11 @@ sap.ui.define([
|
|
|
412
412
|
};
|
|
413
413
|
|
|
414
414
|
/**
|
|
415
|
-
* Set start date
|
|
415
|
+
* Set start date for the interval.
|
|
416
|
+
*
|
|
416
417
|
* @param {Date} oStartDate A JavaScript Date
|
|
417
418
|
* @returns {this} Reference to <code>this</code> for method chaining
|
|
419
|
+
* @public
|
|
418
420
|
*/
|
|
419
421
|
CalendarDateInterval.prototype.setStartDate = function(oStartDate){
|
|
420
422
|
|
|
@@ -466,10 +468,11 @@ sap.ui.define([
|
|
|
466
468
|
|
|
467
469
|
// needs to be overwritten because differently implemented in Calendar
|
|
468
470
|
/**
|
|
469
|
-
*
|
|
471
|
+
* Returns the start date of the interval.
|
|
470
472
|
*
|
|
471
473
|
* Start date of the Interval
|
|
472
474
|
* @returns {Date} JavaScript date object for property <code>startDate</code>
|
|
475
|
+
* @public
|
|
473
476
|
*/
|
|
474
477
|
CalendarDateInterval.prototype.getStartDate = function(){
|
|
475
478
|
|
|
@@ -65,7 +65,7 @@ sap.ui.define([
|
|
|
65
65
|
* <b>Note:</b> JavaScript Date objects are used to set and return the months, mark them as selected or as a special type.
|
|
66
66
|
* But the date part of the Date object is not used. If a Date object is returned the date will be set to the 1st of the corresponding month.
|
|
67
67
|
* @extends sap.ui.core.Control
|
|
68
|
-
* @version 1.
|
|
68
|
+
* @version 1.113.0
|
|
69
69
|
*
|
|
70
70
|
* @constructor
|
|
71
71
|
* @public
|
|
@@ -347,9 +347,11 @@ sap.ui.define([
|
|
|
347
347
|
};
|
|
348
348
|
|
|
349
349
|
/**
|
|
350
|
-
* Sets start date
|
|
350
|
+
* Sets start date for the interval.
|
|
351
|
+
*
|
|
351
352
|
* @param {Date} oStartDate A JavaScript date
|
|
352
353
|
* @returns {this} Reference to <code>this</code> for method chaining
|
|
354
|
+
* @public
|
|
353
355
|
*/
|
|
354
356
|
CalendarMonthInterval.prototype.setStartDate = function(oStartDate){
|
|
355
357
|
|
|
@@ -624,8 +626,10 @@ sap.ui.define([
|
|
|
624
626
|
|
|
625
627
|
/**
|
|
626
628
|
* Sets a minimum date for the calendar.
|
|
629
|
+
*
|
|
627
630
|
* @param {Date} [oDate] A JavaScript Date
|
|
628
631
|
* @returns {this} Reference to <code>this</code> for method chaining
|
|
632
|
+
* @public
|
|
629
633
|
*/
|
|
630
634
|
CalendarMonthInterval.prototype.setMinDate = function(oDate){
|
|
631
635
|
|
|
@@ -683,8 +687,10 @@ sap.ui.define([
|
|
|
683
687
|
|
|
684
688
|
/**
|
|
685
689
|
* Sets a maximum date for the calendar.
|
|
690
|
+
*
|
|
686
691
|
* @param {Date} [oDate] A JavaScript Date
|
|
687
692
|
* @returns {this} Reference to <code>this</code> for method chaining
|
|
693
|
+
* @public
|
|
688
694
|
*/
|
|
689
695
|
CalendarMonthInterval.prototype.setMaxDate = function(oDate){
|
|
690
696
|
|
|
@@ -57,7 +57,7 @@ sap.ui.define([
|
|
|
57
57
|
* Navigation via year picker switches to the corresponding year and the same month as before the navigation.
|
|
58
58
|
*
|
|
59
59
|
* @extends sap.ui.unified.CalendarDateInterval
|
|
60
|
-
* @version 1.
|
|
60
|
+
* @version 1.113.0
|
|
61
61
|
*
|
|
62
62
|
* @constructor
|
|
63
63
|
* @private
|
|
@@ -88,7 +88,7 @@ sap.ui.define([
|
|
|
88
88
|
* @class
|
|
89
89
|
* A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
|
|
90
90
|
* @extends sap.ui.core.Control
|
|
91
|
-
* @version 1.
|
|
91
|
+
* @version 1.113.0
|
|
92
92
|
*
|
|
93
93
|
* @constructor
|
|
94
94
|
* @public
|
|
@@ -466,9 +466,11 @@ sap.ui.define([
|
|
|
466
466
|
};
|
|
467
467
|
|
|
468
468
|
/**
|
|
469
|
-
* Set the start date of the row
|
|
469
|
+
* Set the start date of the row.
|
|
470
|
+
*
|
|
470
471
|
* @param {Date} [oStartDate] Start date, as JavaScript Date object, of the row
|
|
471
472
|
* @returns {this} Reference to <code>this</code> for method chaining
|
|
473
|
+
* @public
|
|
472
474
|
*/
|
|
473
475
|
CalendarRow.prototype.setStartDate = function(oStartDate){
|
|
474
476
|
|
|
@@ -492,6 +494,7 @@ sap.ui.define([
|
|
|
492
494
|
|
|
493
495
|
/**
|
|
494
496
|
* Returns the start date of the row.
|
|
497
|
+
*
|
|
495
498
|
* @returns {sap.ui.core.date.UniversalDate} in UTC timezone
|
|
496
499
|
* @private
|
|
497
500
|
*/
|
|
@@ -68,7 +68,7 @@ sap.ui.define([
|
|
|
68
68
|
* @class
|
|
69
69
|
* Calendar with granularity of time items displayed in one line.
|
|
70
70
|
* @extends sap.ui.core.Control
|
|
71
|
-
* @version 1.
|
|
71
|
+
* @version 1.113.0
|
|
72
72
|
*
|
|
73
73
|
* @constructor
|
|
74
74
|
* @public
|
|
@@ -431,9 +431,11 @@ sap.ui.define([
|
|
|
431
431
|
};
|
|
432
432
|
|
|
433
433
|
/**
|
|
434
|
-
* Sets start date
|
|
434
|
+
* Sets start date for the interval.
|
|
435
|
+
*
|
|
435
436
|
* @param {Date} oStartDate A JavaScript date
|
|
436
437
|
* @returns {this} Reference to <code>this</code> for method chaining
|
|
438
|
+
* @public
|
|
437
439
|
*/
|
|
438
440
|
CalendarTimeInterval.prototype.setStartDate = function(oStartDate){
|
|
439
441
|
|
|
@@ -773,8 +775,10 @@ sap.ui.define([
|
|
|
773
775
|
|
|
774
776
|
/**
|
|
775
777
|
* Set minimum date that can be shown and selected in the Calendar.
|
|
778
|
+
*
|
|
776
779
|
* @param {Date} [oDate] Min date as a JS Date object
|
|
777
780
|
* @returns {this} Reference to <code>this</code> for method chaining
|
|
781
|
+
* @public
|
|
778
782
|
*/
|
|
779
783
|
CalendarTimeInterval.prototype.setMinDate = function(oDate){
|
|
780
784
|
var oTimesRow,
|
|
@@ -837,8 +841,10 @@ sap.ui.define([
|
|
|
837
841
|
|
|
838
842
|
/**
|
|
839
843
|
* Set maximum date that can be shown and selected in the Calendar.
|
|
844
|
+
*
|
|
840
845
|
* @param {Date} [oDate] Max date as a JS Date object
|
|
841
846
|
* @returns {this} Reference to <code>this</code> for method chaining
|
|
847
|
+
* @public
|
|
842
848
|
*/
|
|
843
849
|
CalendarTimeInterval.prototype.setMaxDate = function(oDate){
|
|
844
850
|
var oTimesRow,
|
|
@@ -39,7 +39,7 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
|
|
|
39
39
|
* its start date to the first date of the same week as the date the user chose.
|
|
40
40
|
*
|
|
41
41
|
* @extends sap.ui.unified.CalendarDateInterval
|
|
42
|
-
* @version 1.
|
|
42
|
+
* @version 1.113.0
|
|
43
43
|
*
|
|
44
44
|
* @constructor
|
|
45
45
|
* @private
|