@openui5/sap.ui.unified 1.96.2 → 1.97.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.
Files changed (52) hide show
  1. package/.reuse/dep5 +1 -1
  2. package/THIRDPARTY.txt +2 -1
  3. package/package.json +2 -2
  4. package/src/sap/ui/unified/.library +1 -1
  5. package/src/sap/ui/unified/Calendar.js +70 -37
  6. package/src/sap/ui/unified/CalendarAppointment.js +1 -1
  7. package/src/sap/ui/unified/CalendarDateInterval.js +1 -1
  8. package/src/sap/ui/unified/CalendarLegend.js +1 -1
  9. package/src/sap/ui/unified/CalendarLegendItem.js +1 -1
  10. package/src/sap/ui/unified/CalendarMonthInterval.js +1 -1
  11. package/src/sap/ui/unified/CalendarOneMonthInterval.js +1 -1
  12. package/src/sap/ui/unified/CalendarRow.js +13 -3
  13. package/src/sap/ui/unified/CalendarRowRenderer.js +24 -20
  14. package/src/sap/ui/unified/CalendarTimeInterval.js +1 -1
  15. package/src/sap/ui/unified/CalendarWeekInterval.js +1 -1
  16. package/src/sap/ui/unified/ColorPicker.js +16 -10
  17. package/src/sap/ui/unified/ColorPickerPopover.js +1 -1
  18. package/src/sap/ui/unified/ContentSwitcher.js +1 -1
  19. package/src/sap/ui/unified/Currency.js +1 -1
  20. package/src/sap/ui/unified/CurrencyRenderer.js +1 -1
  21. package/src/sap/ui/unified/DateRange.js +1 -1
  22. package/src/sap/ui/unified/DateTypeRange.js +1 -1
  23. package/src/sap/ui/unified/FileUploader.js +15 -61
  24. package/src/sap/ui/unified/FileUploaderParameter.js +1 -1
  25. package/src/sap/ui/unified/FileUploaderXHRSettings.js +1 -1
  26. package/src/sap/ui/unified/Menu.js +1 -1
  27. package/src/sap/ui/unified/MenuItem.js +1 -1
  28. package/src/sap/ui/unified/MenuItemBase.js +1 -1
  29. package/src/sap/ui/unified/MenuRenderer.js +1 -1
  30. package/src/sap/ui/unified/MenuTextFieldItem.js +1 -1
  31. package/src/sap/ui/unified/Shell.js +1 -1
  32. package/src/sap/ui/unified/ShellHeadItem.js +1 -1
  33. package/src/sap/ui/unified/ShellHeadUserItem.js +1 -1
  34. package/src/sap/ui/unified/ShellLayout.js +1 -1
  35. package/src/sap/ui/unified/ShellOverlay.js +1 -1
  36. package/src/sap/ui/unified/SplitContainer.js +1 -1
  37. package/src/sap/ui/unified/calendar/DatesRow.js +1 -1
  38. package/src/sap/ui/unified/calendar/Header.js +1 -1
  39. package/src/sap/ui/unified/calendar/HeaderRenderer.js +1 -0
  40. package/src/sap/ui/unified/calendar/IndexPicker.js +1 -1
  41. package/src/sap/ui/unified/calendar/Month.js +41 -37
  42. package/src/sap/ui/unified/calendar/MonthPicker.js +1 -1
  43. package/src/sap/ui/unified/calendar/MonthsRow.js +1 -1
  44. package/src/sap/ui/unified/calendar/OneMonthDatesRow.js +1 -1
  45. package/src/sap/ui/unified/calendar/TimesRow.js +1 -1
  46. package/src/sap/ui/unified/calendar/YearPicker.js +1 -1
  47. package/src/sap/ui/unified/calendar/YearRangePicker.js +1 -1
  48. package/src/sap/ui/unified/library.js +2 -2
  49. package/src/sap/ui/unified/messagebundle_en_US_saprigi.properties +0 -2
  50. package/src/sap/ui/unified/messagebundle_ru.properties +1 -1
  51. package/src/sap/ui/unified/themes/base/FileUploader.less +47 -32
  52. package/ui5.yaml +19 -1
package/.reuse/dep5 CHANGED
@@ -418,7 +418,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
418
418
 
419
419
  # Library: sap.ui.webc.common:
420
420
 
421
- Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
421
+ Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
422
422
  Copyright: SAP
423
423
  License: Apache-2.0
424
424
  Comment: these files belong to: UI5 Web Components
package/THIRDPARTY.txt CHANGED
@@ -412,10 +412,11 @@ Copyright: SAP
412
412
  License: Apache-2.0
413
413
  License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
414
414
  Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
415
- src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.*
415
+ src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
416
416
  src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
417
417
  src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
418
418
  src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
419
+ src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
419
420
 
420
421
  Component: lit-html, version: 1.4.1
421
422
  Copyright: Google LLC
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openui5/sap.ui.unified",
3
- "version": "1.96.2",
3
+ "version": "1.97.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.96.2"
17
+ "@openui5/sap.ui.core": "1.97.0"
18
18
  }
19
19
  }
@@ -6,7 +6,7 @@
6
6
  <copyright>OpenUI5
7
7
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
8
8
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
9
- <version>1.96.2</version>
9
+ <version>1.97.0</version>
10
10
 
11
11
  <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
12
12
 
@@ -70,7 +70,7 @@ sap.ui.define([
70
70
  * Basic Calendar.
71
71
  * This calendar is used for DatePickers
72
72
  * @extends sap.ui.core.Control
73
- * @version 1.96.2
73
+ * @version 1.97.0
74
74
  *
75
75
  * @constructor
76
76
  * @public
@@ -1200,44 +1200,56 @@ sap.ui.define([
1200
1200
  Calendar.prototype.onsaptabnext = function(oEvent){
1201
1201
  var oHeader = this.getAggregation("header");
1202
1202
 
1203
- if (containsOrEquals(this.getDomRef("content"), oEvent.target)) {
1204
- if (oHeader.getVisibleButton1()) {
1205
- oHeader.getDomRef("B1").focus();
1206
- oEvent.preventDefault();
1207
- } else if (oHeader.getVisibleButton2()) {
1208
- oHeader.getDomRef("B2").focus();
1209
- oEvent.preventDefault();
1210
- } else if (!this._bPoupupMode) {
1211
- // remove Tabindex from day, month, year - to break cycle
1212
- this._clearTabindex0();
1213
- } else {
1214
- this._clearTabindex0();
1215
- oEvent.preventDefault();
1216
- }
1217
- } else if (oEvent.target.id === oHeader.getId() + "-B1") {
1218
- oHeader.getVisibleButton2() && oHeader.getDomRef("B2").focus();
1219
-
1203
+ if (containsOrEquals(this.getDomRef("content"), oEvent.target)) {
1204
+ if (oHeader.getVisibleButton1()) {
1205
+ oHeader.getDomRef("B1").focus();
1220
1206
  oEvent.preventDefault();
1221
- } else if (oEvent.target.id === oHeader.getId() + "-B2") {
1222
- if (this._bPoupupMode) {
1223
- this._moveFocusToCalContent();
1224
-
1225
- oEvent.preventDefault();
1226
- } else {
1227
- // remove Tabindex from day, month, year - to break cycle
1228
- this._clearTabindex0();
1229
- }
1230
-
1207
+ } else if (oHeader.getVisibleButton2()) {
1208
+ oHeader.getDomRef("B2").focus();
1209
+ oEvent.preventDefault();
1210
+ } else if (oHeader.getVisibleCurrentDateButton()) {
1211
+ oHeader.getDomRef("today").focus();
1212
+ oEvent.preventDefault();
1213
+ } else if (!this._bPoupupMode) {
1214
+ // remove Tabindex from day, month, year - to break cycle
1215
+ this._clearTabindex0();
1216
+ } else {
1217
+ this._clearTabindex0();
1218
+ oEvent.preventDefault();
1219
+ }
1220
+ } else if (oEvent.target.id === oHeader.getId() + "-B1") {
1221
+ oHeader.getVisibleButton2() && oHeader.getDomRef("B2").focus();
1222
+ oEvent.preventDefault();
1223
+ } else if (oEvent.target.id === oHeader.getId() + "-B2") {
1224
+ if (oHeader.getVisibleCurrentDateButton()) {
1225
+ oHeader.getDomRef("today").focus();
1226
+ oEvent.preventDefault();
1227
+ } else {
1228
+ this._tabNextFinalize(this._bPoupupMode, oEvent);
1231
1229
  }
1230
+ } else if (oEvent.target.id === oHeader.getId() + "-today") {
1231
+ this._tabNextFinalize(this._bPoupupMode, oEvent);
1232
+ }
1233
+
1234
+ };
1232
1235
 
1236
+ Calendar.prototype._tabNextFinalize = function(bPopupMode, oEvent) {
1237
+ if (bPopupMode) {
1238
+ this._moveFocusToCalContent();
1239
+ oEvent.preventDefault();
1240
+ } else {
1241
+ // remove Tabindex from day, month, year - to break cycle
1242
+ this._clearTabindex0();
1243
+ }
1233
1244
  };
1234
1245
 
1235
1246
  Calendar.prototype.onsaptabprevious = function(oEvent){
1236
1247
  var oHeader = this.getAggregation("header");
1237
-
1238
1248
  if (containsOrEquals(this.getDomRef("content"), oEvent.target)) {
1239
1249
  if (this._bPoupupMode) {
1240
- if (oHeader.getVisibleButton2()) {
1250
+ if (oHeader.getVisibleCurrentDateButton()) {
1251
+ oHeader.getDomRef("today").focus();
1252
+ } else if (oHeader.getVisibleButton2()) {
1241
1253
  oHeader.getDomRef("B2").focus();
1242
1254
  } else {
1243
1255
  oHeader.getVisibleButton1() && oHeader.getDomRef("B1").focus();
@@ -1249,7 +1261,6 @@ sap.ui.define([
1249
1261
  }
1250
1262
  } else if (oEvent.target.id === oHeader.getId() + "-B1") {
1251
1263
  this._moveFocusToCalContent();
1252
-
1253
1264
  oEvent.preventDefault();
1254
1265
  } else if (oEvent.target.id === oHeader.getId() + "-B2") {
1255
1266
  if (oHeader.getVisibleButton1()) {
@@ -1258,6 +1269,16 @@ sap.ui.define([
1258
1269
  this._moveFocusToCalContent();
1259
1270
  }
1260
1271
 
1272
+ oEvent.preventDefault();
1273
+ } else if (oEvent.target.id === oHeader.getId() + "-today") {
1274
+ if (oHeader.getVisibleButton2()) {
1275
+ oHeader.getDomRef("B2").focus();
1276
+ } else if (oHeader.getVisibleButton1()){
1277
+ oHeader.getDomRef("B1").focus();
1278
+ } else {
1279
+ this._moveFocusToCalContent();
1280
+ }
1281
+
1261
1282
  oEvent.preventDefault();
1262
1283
  }
1263
1284
  };
@@ -1289,6 +1310,7 @@ sap.ui.define([
1289
1310
 
1290
1311
  Calendar.prototype._moveFocusToCalContent = function() {
1291
1312
  var oYearPicker = this.getAggregation("yearPicker"),
1313
+ oYearRangePicker = this.getAggregation("yearRangePicker"),
1292
1314
  oMonthPicker = this._getMonthPicker(),
1293
1315
  aMonths = this.getAggregation("month"),
1294
1316
  oMonth, oMonthDate,
@@ -1301,7 +1323,7 @@ sap.ui.define([
1301
1323
  oMonth = aMonths[i];
1302
1324
  oMonthDate = CalendarDate.fromLocalJSDate(oMonth.getDate(), this.getPrimaryCalendarType());
1303
1325
  if (oFocusedDate.isSame(oMonthDate)) {
1304
- oMonth._oItemNavigation.focusItem(oMonth._oItemNavigation.getFocusedIndex());
1326
+ oMonth.focus();
1305
1327
  } else {
1306
1328
  oMonth._oItemNavigation.getItemDomRefs()[oMonth._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "0");
1307
1329
  }
@@ -1310,16 +1332,23 @@ sap.ui.define([
1310
1332
 
1311
1333
  case 1: // month picker
1312
1334
  if (!this._getSucessorsPickerPopup()) {
1313
- oMonthPicker._oItemNavigation.focusItem(oMonthPicker._oItemNavigation.getFocusedIndex());
1335
+ oMonthPicker.focus();
1314
1336
  }
1315
1337
  break;
1316
1338
 
1317
1339
  case 2: // year picker
1318
1340
  if (!this._getSucessorsPickerPopup()) {
1319
- oYearPicker._oItemNavigation.focusItem(oYearPicker._oItemNavigation.getFocusedIndex());
1341
+ oYearPicker.focus();
1342
+ }
1343
+ break;
1344
+
1345
+ case 3: // year range picker
1346
+ if (!this._getSucessorsPickerPopup()) {
1347
+ oYearRangePicker.focus();
1320
1348
  }
1321
1349
  break;
1322
- // no default
1350
+
1351
+ // no default
1323
1352
  }
1324
1353
  };
1325
1354
 
@@ -1342,9 +1371,12 @@ sap.ui.define([
1342
1371
 
1343
1372
  Calendar.prototype._focusOnShiftTab = function() {
1344
1373
  var oHeader = this.getAggregation("header"),
1345
- oDomRefB2 = oHeader.getDomRef("B2");
1374
+ oDomRefB2 = oHeader.getDomRef("B2"),
1375
+ oDomRefToday = oHeader.getDomRef("today");
1346
1376
 
1347
- if (oDomRefB2) {
1377
+ if (oDomRefToday) {
1378
+ oDomRefToday.focus();
1379
+ } else if (oDomRefB2) {
1348
1380
  oDomRefB2.focus();
1349
1381
  } else {
1350
1382
  this.focus();
@@ -2004,6 +2036,7 @@ sap.ui.define([
2004
2036
  for (i = 0; i < aMonths.length; ++i) {
2005
2037
  if (aMonths[i].checkDateFocusable(oFocusedDate.toLocalJSDate())) {
2006
2038
  aMonths[i].setDate(oFocusedDate.toLocalJSDate());
2039
+ aMonths[i]._focusDate(oFocusedDate);
2007
2040
  return;
2008
2041
  }
2009
2042
  }
@@ -21,7 +21,7 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
21
21
  *
22
22
  * Applications could inherit from this element to add own fields.
23
23
  * @extends sap.ui.unified.DateTypeRange
24
- * @version 1.96.2
24
+ * @version 1.97.0
25
25
  *
26
26
  * @constructor
27
27
  * @public
@@ -57,7 +57,7 @@ sap.ui.define([
57
57
  * @class
58
58
  * <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
59
59
  * @extends sap.ui.unified.Calendar
60
- * @version 1.96.2
60
+ * @version 1.97.0
61
61
  *
62
62
  * @constructor
63
63
  * @public
@@ -34,7 +34,7 @@ sap.ui.define([
34
34
  * @extends sap.ui.core.Control
35
35
  *
36
36
  * @author SAP SE
37
- * @version 1.96.2
37
+ * @version 1.97.0
38
38
  *
39
39
  * @constructor
40
40
  * @public
@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
21
21
  * @class
22
22
  * Item to be displayed in a CalendarLegend.
23
23
  * @extends sap.ui.core.Element
24
- * @version 1.96.2
24
+ * @version 1.97.0
25
25
  *
26
26
  * @constructor
27
27
  * @public
@@ -67,7 +67,7 @@ sap.ui.define([
67
67
  * <b>Note:</b> JavaScript Date objects are used to set and return the months, mark them as selected or as a special type.
68
68
  * 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.
69
69
  * @extends sap.ui.core.Control
70
- * @version 1.96.2
70
+ * @version 1.97.0
71
71
  *
72
72
  * @constructor
73
73
  * @public
@@ -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.96.2
60
+ * @version 1.97.0
61
61
  *
62
62
  * @constructor
63
63
  * @private
@@ -76,7 +76,7 @@ sap.ui.define([
76
76
  * @class
77
77
  * A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
78
78
  * @extends sap.ui.core.Control
79
- * @version 1.96.2
79
+ * @version 1.97.0
80
80
  *
81
81
  * @constructor
82
82
  * @public
@@ -223,7 +223,16 @@ sap.ui.define([
223
223
  * @experimental Since 1.81.0
224
224
  * @since 1.81.0
225
225
  */
226
- appointmentRoundWidth: { type: "sap.ui.unified.CalendarAppointmentRoundWidth", group: "Appearance", defaultValue: CalendarAppointmentRoundWidth.None}
226
+ appointmentRoundWidth: { type: "sap.ui.unified.CalendarAppointmentRoundWidth", group: "Appearance", defaultValue: CalendarAppointmentRoundWidth.None},
227
+
228
+ /**
229
+ * Determines whether the selection of multiple appointments is enabled.
230
+ *
231
+ * Note: selection of multiple appointments is possible using CTRL key regardless of the value of this property.
232
+ *
233
+ * @since 1.97
234
+ */
235
+ multipleAppointmentsSelection : {type : "boolean", group : "Data", defaultValue : false}
227
236
  },
228
237
  aggregations : {
229
238
 
@@ -590,7 +599,8 @@ sap.ui.define([
590
599
  for (var i = 0; i < aVisibleAppointments.length; i++) {
591
600
  var oAppointment = aVisibleAppointments[i].appointment;
592
601
  if (containsOrEquals(oAppointment.getDomRef(), oEvent.target)) {
593
- _selectAppointment.call(this, oAppointment, !(oEvent.ctrlKey || oEvent.metaKey));
602
+ var bRemoveOldSelection = !(this.getMultipleAppointmentsSelection() || oEvent.ctrlKey || oEvent.metaKey);
603
+ _selectAppointment.call(this, oAppointment, bRemoveOldSelection);
594
604
  break;
595
605
  }
596
606
  }
@@ -440,7 +440,7 @@ sap.ui.define([
440
440
  oRm.openEnd();
441
441
 
442
442
  if (oArrowValues.appTimeUnitsDifRowStart > 0) {
443
- oRm.icon("sap-icon://arrow-left", ["sapUiCalendarAppArrowIconLeft"], { title: null });
443
+ oRm.icon("sap-icon://arrow-left", ["sapUiCalendarAppArrowIconLeft"], { title: null, role: "img" });
444
444
  }
445
445
 
446
446
  var sIcon = oIntervalHeader.appointment.getIcon();
@@ -450,6 +450,7 @@ sap.ui.define([
450
450
 
451
451
  mAttributes["id"] = sId + "-Icon";
452
452
  mAttributes["title"] = null;
453
+ mAttributes["role"] = "img";
453
454
  oRm.icon(sIcon, aClasses, mAttributes);
454
455
  }
455
456
 
@@ -472,7 +473,7 @@ sap.ui.define([
472
473
  }
473
474
 
474
475
  if (oArrowValues.appTimeUnitsDifRowEnd > 0) {
475
- oRm.icon("sap-icon://arrow-right",["sapUiCalendarAppArrowIconRight"], { title: null });
476
+ oRm.icon("sap-icon://arrow-right",["sapUiCalendarAppArrowIconRight"], { title: null, role: "img" });
476
477
  }
477
478
 
478
479
  // ARIA information about start and end
@@ -602,13 +603,14 @@ sap.ui.define([
602
603
  });
603
604
  } else {
604
605
  if (oArrowValues.appTimeUnitsDifRowStart > 0) {
605
- oRm.icon("sap-icon://arrow-left", ["sapUiCalendarAppArrowIconLeft"], { title: null });
606
+ oRm.icon("sap-icon://arrow-left", ["sapUiCalendarAppArrowIconLeft"], { title: null, role: "img" });
606
607
  }
607
608
  if (sIcon) {
608
609
  var aClasses = ["sapUiCalendarAppIcon"];
609
610
  var mAttributes = {};
610
611
  mAttributes["id"] = sId + "-Icon";
611
612
  mAttributes["title"] = null;
613
+ mAttributes["role"] = "img";
612
614
  oRm.icon(sIcon, aClasses, mAttributes);
613
615
  }
614
616
  oRm.openStart("div");
@@ -637,25 +639,27 @@ sap.ui.define([
637
639
  }
638
640
  oRm.close("div");
639
641
  if (oArrowValues.appTimeUnitsDifRowEnd > 0) {
640
- oRm.icon("sap-icon://arrow-right", ["sapUiCalendarAppArrowIconRight"], { title: null });
642
+ oRm.icon("sap-icon://arrow-right", ["sapUiCalendarAppArrowIconRight"], { title: null, role: "img" });
641
643
  }
642
- // ARIA information about start and end
643
- var sAriaText = oRow._oRb.getText("CALENDAR_START_TIME") + ": " + oRow._oFormatAria.format(oAppointment.getStartDate());
644
- sAriaText = sAriaText + "; " + oRow._oRb.getText("CALENDAR_END_TIME") + ": " + oRow._oFormatAria.format(oAppointment.getEndDate());
645
- if (oRow._getRelativeInfo && oRow._getRelativeInfo().bIsRelative) {
646
- var oRelativeInfo = oRow._getRelativeInfo();
647
- sAriaText = oRow._oRb.getText("CALENDAR_START_TIME") + ": " + oRelativeInfo.intervalLabelFormatter(oRelativeInfo._getIndexFromDate(oAppointment.getStartDate()));
648
- sAriaText = sAriaText + "; " + oRow._oRb.getText("CALENDAR_END_TIME") + ": " + oRelativeInfo.intervalLabelFormatter(oRelativeInfo._getIndexFromDate(oAppointment.getEndDate()));
649
- }
650
- if (sType && sType != CalendarDayType.None) {
651
- sAriaText = sAriaText + "; " + this.getAriaTextForType(sType, aTypes);
652
- }
653
- oRm.openStart("span", sId + "-Descr");
654
- oRm.class("sapUiInvisibleText");
655
- oRm.openEnd();
656
- oRm.text(sAriaText);
657
- oRm.close("span");
658
644
  }
645
+
646
+ // ARIA information about start and end
647
+ var sAriaText = oRow._oRb.getText("CALENDAR_START_TIME") + ": " + oRow._oFormatAria.format(oAppointment.getStartDate());
648
+ sAriaText = sAriaText + "; " + oRow._oRb.getText("CALENDAR_END_TIME") + ": " + oRow._oFormatAria.format(oAppointment.getEndDate());
649
+ if (oRow._getRelativeInfo && oRow._getRelativeInfo().bIsRelative) {
650
+ var oRelativeInfo = oRow._getRelativeInfo();
651
+ sAriaText = oRow._oRb.getText("CALENDAR_START_TIME") + ": " + oRelativeInfo.intervalLabelFormatter(oRelativeInfo._getIndexFromDate(oAppointment.getStartDate()));
652
+ sAriaText = sAriaText + "; " + oRow._oRb.getText("CALENDAR_END_TIME") + ": " + oRelativeInfo.intervalLabelFormatter(oRelativeInfo._getIndexFromDate(oAppointment.getEndDate()));
653
+ }
654
+ if (sType && sType != CalendarDayType.None) {
655
+ sAriaText = sAriaText + "; " + this.getAriaTextForType(sType, aTypes);
656
+ }
657
+ oRm.openStart("span", sId + "-Descr");
658
+ oRm.class("sapUiInvisibleText");
659
+ oRm.openEnd();
660
+ oRm.text(sAriaText);
661
+ oRm.close("span");
662
+
659
663
  //app content
660
664
  oRm.close("div");
661
665
 
@@ -72,7 +72,7 @@ sap.ui.define([
72
72
  * @class
73
73
  * Calendar with granularity of time items displayed in one line.
74
74
  * @extends sap.ui.core.Control
75
- * @version 1.96.2
75
+ * @version 1.97.0
76
76
  *
77
77
  * @constructor
78
78
  * @public
@@ -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.96.2
42
+ * @version 1.97.0
43
43
  *
44
44
  * @constructor
45
45
  * @private
@@ -65,7 +65,7 @@ sap.ui.define([
65
65
  * @extends sap.ui.core.Control
66
66
  *
67
67
  * @author SAP SE
68
- * @version 1.96.2
68
+ * @version 1.97.0
69
69
  *
70
70
  * @constructor
71
71
  * @public
@@ -576,10 +576,6 @@ sap.ui.define([
576
576
  this._processChanges = this._processHSVChanges;
577
577
  this._bHSLMode = false;
578
578
 
579
- if (this.getDisplayMode() === ColorPickerDisplayMode.Simplified) {
580
- CONSTANTS.HideForDisplay.value = ".hideDisplay";
581
- }
582
-
583
579
  this.bPressed = false;
584
580
  };
585
581
 
@@ -1040,6 +1036,9 @@ sap.ui.define([
1040
1036
 
1041
1037
  // Create internal controls
1042
1038
  this._createInteractionControls();
1039
+ if (this.getDisplayMode() === ColorPickerDisplayMode.Large) {
1040
+ this._toggleInputsEnabled(this.Color.formatHSL);
1041
+ }
1043
1042
 
1044
1043
  // Layout Data - that will be needed for visual state update
1045
1044
  this.oCPBoxGD = new GridData({span: "L6 M6 S12"}); // Color picker box
@@ -1339,14 +1338,21 @@ sap.ui.define([
1339
1338
  /**
1340
1339
  * Event handler for changes of RGB or HSL radio button field.
1341
1340
  */
1342
- ColorPicker.prototype._handleRGBorHSLValueChange = function() {
1343
- // store new value
1344
- var oUnifiedRBGroup = this.oRGBorHSLRBUnifiedGroup;
1345
- this.Color.formatHSL = oUnifiedRBGroup ? oUnifiedRBGroup.getSelectedIndex() === 1 : this.oRGBorHSLRBGroup.getSelectedIndex() === 1;
1346
-
1341
+ ColorPicker.prototype._handleRGBorHSLValueChange = function(oEvent) {
1342
+ this.Color.formatHSL = oEvent.getParameter("selectedIndex") === 1;
1343
+ this._toggleInputsEnabled(this.Color.formatHSL);
1347
1344
  this._updateColorStringProperty(true, true);
1348
1345
  };
1349
1346
 
1347
+ ColorPicker.prototype._toggleInputsEnabled = function(bHSL) {
1348
+ this.oRedField.setEnabled(!bHSL);
1349
+ this.oGreenField.setEnabled(!bHSL);
1350
+ this.oBlueField.setEnabled(!bHSL);
1351
+ this.oHueField.setEnabled(!!bHSL);
1352
+ this.oSatField.setEnabled(!!bHSL);
1353
+ this.oLitField.setEnabled(!!bHSL);
1354
+ };
1355
+
1350
1356
  /**
1351
1357
  * Event handler for changes of Hue input field.
1352
1358
  * @private
@@ -47,7 +47,7 @@ sap.ui.define([
47
47
  * A thin wrapper over {@link sap.ui.unified.ColorPicker} allowing the latter to be used in a popover.
48
48
  *
49
49
  * @extends sap.ui.core.Control
50
- * @version 1.96.2
50
+ * @version 1.97.0
51
51
  *
52
52
  * @constructor
53
53
  * @public
@@ -31,7 +31,7 @@ sap.ui.define([
31
31
  * @extends sap.ui.core.Control
32
32
  *
33
33
  * @author SAP SE
34
- * @version 1.96.2
34
+ * @version 1.97.0
35
35
  *
36
36
  * @constructor
37
37
  * @public
@@ -58,7 +58,7 @@ sap.ui.define([
58
58
  * @extends sap.ui.core.Control
59
59
  *
60
60
  * @author SAP SE
61
- * @version 1.96.2
61
+ * @version 1.97.0
62
62
  *
63
63
  * @constructor
64
64
  * @public
@@ -14,7 +14,7 @@ sap.ui.define(["sap/m/library", "sap/ui/core/Core"],
14
14
  /**
15
15
  * Currency renderer.
16
16
  *
17
- * @version 1.96.2
17
+ * @version 1.97.0
18
18
  * @namespace
19
19
  */
20
20
  var CurrencyRenderer = {
@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/calendar/Cale
20
20
  * @class
21
21
  * Date range for use in DatePicker
22
22
  * @extends sap.ui.core.Element
23
- * @version 1.96.2
23
+ * @version 1.97.0
24
24
  *
25
25
  * @constructor
26
26
  * @public
@@ -25,7 +25,7 @@ sap.ui.define(['./DateRange', './library'],
25
25
  * @class
26
26
  * Date range with calendar day type information. Used to visualize special days in the Calendar.
27
27
  * @extends sap.ui.unified.DateRange
28
- * @version 1.96.2
28
+ * @version 1.97.0
29
29
  *
30
30
  * @constructor
31
31
  * @public