@openui5/sap.m 1.124.0 → 1.125.0

package/src/sap/m/SinglePlanningCalendarDayView.js

@@ -25,7 +25,7 @@ function (library, SinglePlanningCalendarView) {
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public
@@ -44,7 +44,7 @@ function (library, SinglePlanningCalendarView) {
 	/**
 	 * Returns the number of columns to be displayed in the grid of the <code>sap.m.SinglePlanningCalendar</code>.
 	 *
-	 * @return {int} the number of columns to be displayed
+	 * @returns {int} the number of columns to be displayed
 	 * @override
 	 * @public
 	 */
@@ -56,7 +56,7 @@ function (library, SinglePlanningCalendarView) {
 	 * Should return a number of entities until the next/previous startDate of the
 	 * <code>sap.m.SinglePlanningCalendar</code> after navigating forward or backwards.
 	 *
-	 * @return {int} the number of entities to be skipped by scrolling
+	 * @returns {int} the number of entities to be skipped by scrolling
 	 * @override
 	 * @public
 	 */
@@ -68,13 +68,13 @@ function (library, SinglePlanningCalendarView) {
 	 * Calculates the startDate which will be displayed in the <code>sap.m.SinglePlanningCalendar</code> based
 	 * on a given date.
 	 *
-	 * @param {object} oStartDate the given date
-	 * @return {object} the startDate of the view
+	 * @param {Date|module:sap/ui/core/date/UI5Date} oDate The given date
+	 * @returns {Date|module:sap/ui/core/date/UI5Date} The startDate of the view
 	 * @override
 	 * @public
 	 */
-	SinglePlanningCalendarDayView.prototype.calculateStartDate = function (oStartDate) {
-		return oStartDate;
+	SinglePlanningCalendarDayView.prototype.calculateStartDate = function (oDate) {
+		return oDate;
 	};
 
 	return SinglePlanningCalendarDayView;

package/src/sap/m/SinglePlanningCalendarGrid.js

@@ -115,7 +115,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SinglePlanningCalendarMonthGrid.js

@@ -7,7 +7,6 @@
 // Provides control sap.m.SinglePlanningCalendarMonthGrid.
 sap.ui.define([
 	'sap/base/i18n/Formatting',
-	'sap/ui/core/Element',
 	'sap/ui/core/Control',
 	'sap/ui/core/format/DateFormat',
 	'sap/ui/unified/calendar/CalendarDate',
@@ -35,7 +34,6 @@ sap.ui.define([
 	],
 	function (
 		Formatting,
-		Element,
 		Control,
 		DateFormat,
 		CalendarDate,
@@ -97,7 +95,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 *
 		 * @constructor
 		 * @private
@@ -265,7 +263,11 @@ sap.ui.define([
 							 * The date as a UI5Date or JavaScript Date object of the cell with the
 							 * pressed more link.
 							 */
-							date: { type: "object" }
+							date: {type: "object"},
+							/**
+							 * The link that has been triggered
+							 */
+							sourceLink: {type: "sap.m.Link"}
 						}
 					},
 					/**
@@ -398,6 +400,7 @@ sap.ui.define([
 
 			for (var i = 0; i < this._aLinks.length; i++) {
 				if (this._aLinks[i]) {
+					this._aLinks[i].removeDelegate(this.oAfterLinkRenderDelegate);
 					this._aLinks[i].destroy();
 				}
 			}
@@ -501,9 +504,9 @@ sap.ui.define([
 				if (SinglePlanningCalendarSelectionMode.SingleSelect === this.getDateSelectionMode()) {
 					return;
 				}
+				this._bCurrentWeekSelection = true;
 			}
 
-			this._bMultiDateSelect = true;
 			this._fireSelectionEvent(oEvent);
 		};
 
@@ -555,25 +558,30 @@ sap.ui.define([
 		 * @param {jQuery.Event} oEvent The event object.
 		 */
 		SinglePlanningCalendarMonthGrid.prototype.onkeydown = function(oEvent) {
-			var bMultiDateSelection = SinglePlanningCalendarSelectionMode.MultiSelect === this.getDateSelectionMode();
+			const bArrowNavigation = oEvent.which === KeyCodes.ARROW_UP ||  oEvent.which === KeyCodes.ARROW_DOWN ||
+				oEvent.which === KeyCodes.ARROW_LEFT || oEvent.which === KeyCodes.ARROW_RIGHT;
+			const bMultiDateSelection = SinglePlanningCalendarSelectionMode.MultiSelect === this.getDateSelectionMode();
 
-			if (oEvent.which === KeyCodes.SPACE || oEvent.which === KeyCodes.ENTER || oEvent.which === KeyCodes.ARROW_UP ||
-				oEvent.which === KeyCodes.ARROW_DOWN || oEvent.which === KeyCodes.ARROW_LEFT || oEvent.which === KeyCodes.ARROW_RIGHT) {
+			if (bArrowNavigation && !oEvent.shiftKey && !bMultiDateSelection) {
+				return;
+			}
+
+			if (oEvent.which === KeyCodes.SPACE || oEvent.which === KeyCodes.ENTER || bArrowNavigation) {
 				if (oEvent.which === KeyCodes.SPACE && !oEvent.shiftKey) {
-					this._bMultiDateSelect = true;
+					this._fireSelectionEvent(oEvent);
 				} else if (oEvent.which === KeyCodes.SPACE && oEvent.shiftKey && bMultiDateSelection) {
 					this._bCurrentWeekSelection = true;
-				} else if (
-					(oEvent.which === KeyCodes.ARROW_UP ||  oEvent.which === KeyCodes.ARROW_DOWN ||
-					oEvent.which === KeyCodes.ARROW_LEFT || oEvent.which === KeyCodes.ARROW_RIGHT) &&
-					oEvent.shiftKey && bMultiDateSelection) {
-						this._bMultiDateSelectWithArrow = true;
+					this._fireSelectionEvent(oEvent);
+				} else if (bArrowNavigation && oEvent.shiftKey && bMultiDateSelection) {
+					this._bMultiDateSelectWithArrow = true;
+					this._fireSelectionEvent(oEvent);
 				}
 
-				this._fireSelectionEvent(oEvent);
-
 				var oControl = this._findSrcControl(oEvent);
 				if (oControl && oControl.isA("sap.ui.unified.CalendarAppointment")) {
+					const oTarget = oEvent.target;
+					const bCtrlKeyOrMetaKey = oEvent.ctrlKey || oEvent.metaKey;
+					this._fireAppointmentSelection(oTarget, oControl, bCtrlKeyOrMetaKey);
 					var sBundleKey = oControl.getSelected() ? "APPOINTMENT_SELECTED" : "APPOINTMENT_UNSELECTED";
 					this._oInvisibleMessage.announce(this._oUnifiedRB.getText(sBundleKey), InvisibleMessageMode.Polite);
 				}
@@ -632,13 +640,13 @@ sap.ui.define([
 		SinglePlanningCalendarMonthGrid.prototype._handelMultiDateSelection = function (oTarget, oStartDate,  oEndDate, oEvent) {
 			const aOldSelectedDateState = this.getAggregation("selectedDates");
 			const bMultiDateSelection = SinglePlanningCalendarSelectionMode.MultiSelect === this.getDateSelectionMode();
+			const bSingleDateSelect = !this._bMultiDateSelectWithArrow && !this._bCurrentWeekSelection;
 
 			if ((oEvent.which === KeyCodes.SPACE && !oEvent.shiftKey) || (!bMultiDateSelection && !(oEvent.metaKey || oEvent.ctrlKey))) {
 				this.removeAllAggregation("selectedDates");
 			}
 
-			if (this._bMultiDateSelect) {
-				this._bMultiDateSelect = false;
+			if (bSingleDateSelect) {
 				this._toggleMarkCell(oTarget, oStartDate);
 
 			} else if (this._bMultiDateSelectWithArrow){
@@ -658,7 +666,7 @@ sap.ui.define([
 				oStartDate = UI5Date.getInstance(oDate.getUTCFullYear(), oStartDate.getUTCMonth(), oStartDate.getUTCDate());
 				this._toggleMarkCell(oTarget, oStartDate);
 
-			} else if (this._bCurrentWeekSelection && SinglePlanningCalendarSelectionMode.MultiSelect === this.getDateSelectionMode()){
+			} else if (this._bCurrentWeekSelection && bMultiDateSelection){
 				var iStartDate = oStartDate.getDate(),
 				oWeekConfigurationValues = CalendarDateUtils.getWeekConfigurationValues(this.getCalendarWeekNumbering(), new Locale(new Locale(Formatting.getLanguageTag()).toString())),
 					iAPIFirstDayOfWeek = this.getFirstDayOfWeek(),
@@ -706,64 +714,60 @@ sap.ui.define([
 		 * @param {jQuery.Event} oEvent The event object.
 		 */
 		SinglePlanningCalendarMonthGrid.prototype._fireSelectionEvent = function (oEvent) {
-			var oSrcControl = this._findSrcControl(oEvent),
+			const oSrcControl = this._findSrcControl(oEvent),
 				oTarget = oEvent.target,
 				oSelectedCell = this._findSelectCell(oEvent.target),
 				bIsCell = oTarget && !!oSelectedCell,
 				bIsLink = oTarget && oTarget.classList.contains("sapMLnk"),
-				bWeekNumberSelect = oTarget && oTarget.classList.contains("sapMSPCMonthWeekNumber"),
-				oFirstSiblingElement = bWeekNumberSelect && oEvent.originalEvent.target.nextSibling.children[0],
-				iTimestamp,
-				oStartDate,
-				oEndDate;
-
-			if (oSrcControl && oSrcControl.isA("sap.m.SinglePlanningCalendarMonthGrid") && bIsCell && !bIsLink) {
-				iTimestamp = parseInt(oSelectedCell.getAttribute("sap-ui-date"));
-
-				oStartDate = UI5Date.getInstance(iTimestamp);
-				oStartDate = UI5Date.getInstance(oStartDate.getUTCFullYear(), oStartDate.getUTCMonth(), oStartDate.getUTCDate());
-
-				oEndDate = UI5Date.getInstance(oStartDate);
-				oEndDate.setDate(oEndDate.getDate() + 1);
-				if (this._bMultiDateSelect || this._bCurrentWeekSelection || this._bMultiDateSelectWithArrow) {
-					this._handelMultiDateSelection(oSelectedCell, oStartDate, oEndDate, oEvent);
-				}
+				bWeekNumberSelect = oTarget && oTarget.classList.contains("sapMSPCMonthWeekNumber");
 
-				this.fireEvent("cellPress", {startDate: oStartDate, endDate: oEndDate});
+			if ((oSrcControl && oSrcControl.isA("sap.m.SinglePlanningCalendarMonthGrid") && bIsCell && !bIsLink) || bWeekNumberSelect) {
+				this._fireGridCellSelectionEvent(oEvent, bWeekNumberSelect);
+				// deselect all appointments
 				this.fireAppointmentSelect({
 					appointment: undefined,
 					appointments: this._toggleAppointmentSelection(undefined, true)
 				});
-			} else if (bWeekNumberSelect) {
-				iTimestamp = parseInt(oFirstSiblingElement.getAttribute("sap-ui-date"));
-				oStartDate = UI5Date.getInstance(iTimestamp);
-				oStartDate = UI5Date.getInstance(oStartDate.getUTCFullYear(), oStartDate.getUTCMonth(), oStartDate.getUTCDate());
-
-				oEndDate = UI5Date.getInstance(oStartDate);
-				oEndDate.setDate(oEndDate.getDate() + 6);
-
-				this._bCurrentWeekSelection = true;
-				this._bMultiDateSelect = false;
-				this._handelMultiDateSelection(oSelectedCell, oStartDate, oEndDate, oEvent);
-
 			} else if (oSrcControl && oSrcControl.isA("sap.ui.unified.CalendarAppointment")) {
-				// add suffix in appointment
-				if (oTarget.parentElement && oTarget.parentElement.getAttribute("id")) {
-					var sTargetId = oTarget.parentElement.getAttribute("id");
+				const bCtrlKeyOrMetaKey = oEvent.ctrlKey || oEvent.metaKey;
+				this._fireAppointmentSelection(oTarget, oSrcControl, bCtrlKeyOrMetaKey);
+			}
+		};
 
-					// data-sap-ui-related - This is a relation to appointment object.
-					// This is the connection between the DOM Element and the Object representing an appointment.
-					var sBaseIDPart = oTarget.parentElement.getAttribute("data-sap-ui-related");
-					var sSuffix = sTargetId.replace(sBaseIDPart + "-", "");
+		SinglePlanningCalendarMonthGrid.prototype._fireAppointmentSelection = function (oTarget, oSrcControl, bCtrlKeyOrMetaKey) {
+			// add suffix in appointment
+			if (oTarget.parentElement && oTarget.parentElement.getAttribute("id")) {
+				var sTargetId = oTarget.parentElement.getAttribute("id");
 
-					oSrcControl._setAppointmentPartSuffix(sSuffix);
-				}
+				// data-sap-ui-related - This is a relation to appointment object.
+				// This is the connection between the DOM Element and the Object representing an appointment.
+				var sBaseIDPart = oTarget.parentElement.getAttribute("data-sap-ui-related");
+				var sSuffix = sTargetId.replace(sBaseIDPart + "-", "");
 
-				this.fireAppointmentSelect({
-					appointment: oSrcControl,
-					appointments: this._toggleAppointmentSelection(oSrcControl, !(oEvent.ctrlKey || oEvent.metaKey))
-				});
+				oSrcControl._setAppointmentPartSuffix(sSuffix);
 			}
+
+			this.fireAppointmentSelect({
+				appointment: oSrcControl,
+				appointments: this._toggleAppointmentSelection(oSrcControl, !bCtrlKeyOrMetaKey)
+			});
+		};
+
+		SinglePlanningCalendarMonthGrid.prototype._fireGridCellSelectionEvent = function (oEvent, bWeekNumberSelect){
+			const iExtraDayCount = 6;
+			const iSingleDay = 1;
+			const oSelectedCell = bWeekNumberSelect ? oEvent.originalEvent.target.nextSibling.children[0] : this._findSelectCell(oEvent.target);
+			const iNextDays = bWeekNumberSelect ? iExtraDayCount : iSingleDay;
+			const iTimestamp = parseInt(oSelectedCell.getAttribute("sap-ui-date"));
+			let oStartDate = UI5Date.getInstance(iTimestamp);
+			oStartDate = UI5Date.getInstance(oStartDate.getUTCFullYear(), oStartDate.getUTCMonth(), oStartDate.getUTCDate());
+			const oEndDate = UI5Date.getInstance(oStartDate);
+			oEndDate.setDate(oEndDate.getDate() + iNextDays);
+
+			this._handelMultiDateSelection(oSelectedCell, oStartDate, oEndDate, oEvent, bWeekNumberSelect);
+
+			// eslint-disable-next-line no-unused-expressions
+			!bWeekNumberSelect && this.fireEvent("cellPress", {startDate: oStartDate, endDate: oEndDate});
 		};
 
 		SinglePlanningCalendarMonthGrid.prototype._toggleMarkCell = function (oTarget, oDay) {
@@ -826,12 +830,13 @@ sap.ui.define([
 			return aChangedApps;
 		};
 
-		SinglePlanningCalendarMonthGrid.prototype._getMoreLink = function(iAppointmentsCount, oCalendarDate, iCellIndex) {
+		SinglePlanningCalendarMonthGrid.prototype._getMoreLink = function(iAppointmentsCount, oCalendarDate, iCellIndex, sMoreLinkDescId) {
 			var sMore = Core
 					.getLibraryResourceBundle("sap.m")
 					.getText("SPC_MORE_LINK", [iAppointmentsCount.toString()]),
 				oLink = new Link({
 					accessibleRole: LinkAccessibleRole.Button,
+					ariaLabelledBy: [sMoreLinkDescId],
 					text: sMore,
 					press: this._handleMorePress
 				}).addCustomData(new CustomData({
@@ -839,22 +844,44 @@ sap.ui.define([
 					value: oCalendarDate.valueOf().toString(),
 					writeToDom: true
 				}));
+			this.oAfterLinkRenderDelegate = this._getMoreLinkOnAfterRenderingDelegate(oLink);
 
 			if (this._aLinks[iCellIndex]) {
+				this._aLinks[iCellIndex].removeDelegate(this.oAfterLinkRenderDelegate);
 				this._aLinks[iCellIndex].destroy();
 			}
+
+			oLink.addDelegate(this.oAfterLinkRenderDelegate);
 			this._aLinks[iCellIndex] = oLink;
 
 			return oLink;
 		};
 
+		SinglePlanningCalendarMonthGrid.prototype._getMoreLinkOnAfterRenderingDelegate = function (oLink) {
+			return {
+				onAfterRendering: function() {
+					const oLinkDomRef = oLink.getDomRef();
+					const sDescriptionId = oLinkDomRef.getAttribute("aria-labelledby").split(" ")[0];
+					oLinkDomRef.setAttribute("aria-labelledby", sDescriptionId);
+				}
+			};
+		};
+
+		SinglePlanningCalendarMonthGrid.prototype._getMoreLinkDescription = function (iAppointmentsCount, oCalendarDate) {
+			const sFormattedString = this._oFormatAriaFullDayCell.format(oCalendarDate);
+			const oBundle = Core.getLibraryResourceBundle("sap.m");
+			return iAppointmentsCount === 1 ?
+				oBundle.getText("SPC_MORE_LINK_ONE_APPOINTMENT", [sFormattedString]) :
+				oBundle.getText("SPC_MORE_LINK_MULTIPLE_APPOINTMENTS", [iAppointmentsCount.toString(), sFormattedString]);
+		};
+
 		SinglePlanningCalendarMonthGrid.prototype._handleMorePress = function(oEvent) {
 			var iTimestamp = parseInt(oEvent.getSource().getCustomData()[0].getValue()),
 				oDate = UI5Date.getInstance(iTimestamp);
 
 			oDate = UI5Date.getInstance(oDate.getUTCFullYear(), oDate.getUTCMonth(), oDate.getUTCDate());
 
-			this.fireEvent("moreLinkPress", { date: oDate });
+			this.fireEvent("moreLinkPress", { date: oDate, sourceLink: oEvent.getSource() });
 		};
 
 		SinglePlanningCalendarMonthGrid.prototype._getCoreLocaleData = function() {
@@ -1439,9 +1466,7 @@ sap.ui.define([
 		};
 
 		SinglePlanningCalendarMonthGrid.prototype.getFocusDomRef = function() {
-			return this._sSelectedAppointment
-				? this._sSelectedAppointment.getDomRef()
-				: Element.prototype.getFocusDomRef.apply(this, arguments);
+			return this._sSelectedAppointment ? this._sSelectedAppointment.getDomRef() : this._oItemNavigation.getFocusedDomRef();
 		};
 
 		return SinglePlanningCalendarMonthGrid;

package/src/sap/m/SinglePlanningCalendarMonthGridRenderer.js

@@ -158,7 +158,8 @@ sap.ui.define([
 				oFormat = oControl._getDateFormatter(),
 				bToday = oDay.isSame(CalendarDate.fromLocalJSDate(UI5Date.getInstance())),
 				oType,
-				sLegendItemType;
+				sLegendItemType,
+				sMoreLinkDescId;
 
 			oRm.openStart("div");
 			oRm.class("sapMSPCMonthDay");
@@ -213,11 +214,19 @@ sap.ui.define([
 			oRm.close("div");
 
 			if (more) {
+				sMoreLinkDescId = oFormat.format(oDay.toLocalJSDate()) + "-MoreLinkDesc";
 				oRm.openStart("div");
 				oRm.class("sapMSPCMonthLnkMore");
 				oRm.openEnd();
 
-				oRm.renderControl(oControl._getMoreLink(more, oDay, iCellIndex));
+				oRm.renderControl(oControl._getMoreLink(more, oDay, iCellIndex, sMoreLinkDescId));
+
+				oRm.openStart("span", sMoreLinkDescId);
+				oRm.class("sapUiInvisibleText");
+				oRm.openEnd();
+				oRm.text(oControl._getMoreLinkDescription(more, oDay.toLocalJSDate()));
+				oRm.close("span");
+
 				oRm.close("div");
 			}
 

package/src/sap/m/SinglePlanningCalendarMonthView.js

@@ -28,7 +28,7 @@ sap.ui.define([
 		 * @extends sap.m.SinglePlanningCalendarView
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 *
 		 * @constructor
 		 * @public
@@ -54,7 +54,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oStartDate The current start date
 		 * @param {int} iOffset The number of pages to scroll, negative means backwards
-		 * @return {int} The number of entities to be skipped by scrolling
+		 * @returns {int} The number of entities to be skipped by scrolling
 		 * @override
 		 * @public
 		 */
@@ -76,13 +76,13 @@ sap.ui.define([
 		 * Calculates the <code>startDate</code> displayed in the <code>sap.m.SinglePlanningCalendar</code> based
 		 * on a given date.
 		 *
-		 * @param {object} oStartDate The given date
-		 * @return {object} The startDate of the view
+		 * @param {Date|module:sap/ui/core/date/UI5Date} oDate The given date
+		 * @returns {Date|module:sap/ui/core/date/UI5Date} The startDate of the view
 		 * @override
 		 * @public
 		 */
-		SinglePlanningCalendarMonthView.prototype.calculateStartDate = function(oStartDate) {
-			var oReturnDate = CalendarUtils.getFirstDateOfMonth(CalendarUtils._createUTCDate(oStartDate, true)).getJSDate();
+		SinglePlanningCalendarMonthView.prototype.calculateStartDate = function(oDate) {
+			var oReturnDate = CalendarUtils.getFirstDateOfMonth(CalendarUtils._createUTCDate(oDate, true)).getJSDate();
 			return CalendarUtils._createLocalDate(oReturnDate, true);
 		};
 

package/src/sap/m/SinglePlanningCalendarView.js

@@ -26,7 +26,7 @@ function (library, Log, Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public
@@ -76,11 +76,12 @@ function (library, Log, Element) {
 	/**
 	 * Should return the number of columns to be displayed in the grid of the <code>sap.m.SinglePlanningCalendar</code>.
 	 *
+	 * @returns {int} the number of columns to be displayed
 	 * @public
 	 * @abstract
 	 */
 	SinglePlanningCalendarView.prototype.getEntityCount = function () {
-		Log.warning("This method should be implemented in one of the inherited classes.", this);
+		throw new Error("This method should be implemented in one of the inherited classes.");
 	};
 
 	/**
@@ -89,23 +90,25 @@ function (library, Log, Element) {
 	 * pressing the forward button inside the work week view, the next startDate of a work week will be 7 entities
 	 * (days) away from the current one.
 	 *
+	 * @returns {int} the number of entities to be skipped by scrolling
 	 * @public
 	 * @abstract
 	 */
 	SinglePlanningCalendarView.prototype.getScrollEntityCount = function () {
-		Log.warning("This method should be implemented in one of the inherited classes.", this);
+		throw new Error("This method should be implemented in one of the inherited classes.");
 	};
 
 	/**
 	 * Should calculate the startDate which will be displayed in the <code>sap.m.SinglePlanningCalendar</code>
 	 * based on a given date.
 	 *
-	 * @param {Date|module:sap/ui/core/date/UI5Date} oDate A date instance
+	 * @param {Date|module:sap/ui/core/date/UI5Date} oDate The given date
+	 * @returns {Date|module:sap/ui/core/date/UI5Date} The startDate of the view
 	 * @public
 	 * @abstract
 	 */
 	SinglePlanningCalendarView.prototype.calculateStartDate = function (oDate) {
-		Log.warning("This method should be implemented in one of the inherited classes.", this);
+		throw new Error("This method should be implemented in one of the inherited classes.");
 	};
 
 	return SinglePlanningCalendarView;

package/src/sap/m/SinglePlanningCalendarWeekView.js

@@ -31,7 +31,7 @@ function (library, SinglePlanningCalendarView, Formatting, LocaleData, CalendarD
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public
@@ -50,7 +50,7 @@ function (library, SinglePlanningCalendarView, Formatting, LocaleData, CalendarD
 	 * Returns after how much entities is the next/previous startDate of the <code>sap.m.SinglePlanningCalendar</code> after
 	 * navigating forward or backwards.
 	 *
-	 * @return {int} the number of entities to be skipped by scrolling
+	 * @returns {int} the number of entities to be skipped by scrolling
 	 * @override
 	 * @public
 	 */
@@ -62,7 +62,7 @@ function (library, SinglePlanningCalendarView, Formatting, LocaleData, CalendarD
 	 * Should return a number of entities until the next/previous startDate of the
 	 * <code>sap.m.SinglePlanningCalendar</code> after navigating forward or backwards.
 	 *
-	 * @return {int} the number of entities to be skipped by scrolling
+	 * @returns {int} the number of entities to be skipped by scrolling
 	 */
 	SinglePlanningCalendarWeekView.prototype.getScrollEntityCount = function () {
 		return 7;
@@ -72,12 +72,12 @@ function (library, SinglePlanningCalendarView, Formatting, LocaleData, CalendarD
 	 * Calculates the startDate which will be displayed in the <code>sap.m.SinglePlanningCalendar</code> based
 	 * on a given date.
 	 *
-	 * @param {object} oStartDate the given date
-	 * @return {object} the startDate of the view
+	 * @param {Date|module:sap/ui/core/date/UI5Date} oDate The given date
+	 * @returns {Date|module:sap/ui/core/date/UI5Date} The startDate of the view
 	 * @override
 	 * @public
 	 */
-	SinglePlanningCalendarWeekView.prototype.calculateStartDate = function (oStartDate) {
+	SinglePlanningCalendarWeekView.prototype.calculateStartDate = function (oDate) {
 
 		var sLocale = new Locale(Formatting.getLanguageTag()).toString();
 
@@ -94,9 +94,9 @@ function (library, SinglePlanningCalendarView, Formatting, LocaleData, CalendarD
 				}
 			}
 
-		oStartDate.setDate(oStartDate.getDate() - oStartDate.getDay() + iFirstDayOfWeek);
+			oDate.setDate(oDate.getDate() - oDate.getDay() + iFirstDayOfWeek);
 		return CalendarUtils
-			._getFirstDateOfWeek(CalendarDate.fromLocalJSDate(oStartDate), {
+			._getFirstDateOfWeek(CalendarDate.fromLocalJSDate(oDate), {
 				firstDayOfWeek: iFirstDayOfWeek,
 				minimalDaysInFirstWeek: oLocaleData.getMinimalDaysInFirstWeek()
 			})

package/src/sap/m/SinglePlanningCalendarWorkWeekView.js

@@ -30,7 +30,7 @@ function(library, SinglePlanningCalendarView, Formatting, Locale, CalendarDate,
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public
@@ -49,7 +49,7 @@ function(library, SinglePlanningCalendarView, Formatting, Locale, CalendarDate,
 	/**
 	 * Returns the number of columns to be displayed in the grid of the <code>sap.m.SinglePlanningCalendar</code>.
 	 *
-	 * @return {int} the number of columns to be displayed
+	 * @returns {int} the number of columns to be displayed
 	 * @override
 	 * @public
 	 */
@@ -61,7 +61,7 @@ function(library, SinglePlanningCalendarView, Formatting, Locale, CalendarDate,
 	 * Should return a number of entities until the next/previous startDate of the
 	 * <code>sap.m.SinglePlanningCalendar</code> after navigating forward or backwards.
 	 *
-	 * @return {int} the number of entities to be skipped by scrolling
+	 * @returns {int} the number of entities to be skipped by scrolling
 	 * @override
 	 * @public
 	 */
@@ -73,13 +73,13 @@ function(library, SinglePlanningCalendarView, Formatting, Locale, CalendarDate,
 	 * Calculates the startDate which will be displayed in the <code>sap.m.SinglePlanningCalendar</code> based
 	 * on a given date.
 	 *
-	 * @param {object} oStartDate the given date
-	 * @return {object} the startDate of the view
+	 * @param {Date|module:sap/ui/core/date/UI5Date} oDate The given date
+	 * @returns {Date|module:sap/ui/core/date/UI5Date} The startDate of the view
 	 * @override
 	 * @public
 	 */
-	SinglePlanningCalendarWorkWeekView.prototype.calculateStartDate = function (oStartDate) {
-		var oCalDate = CalendarDate.fromLocalJSDate(oStartDate),
+	SinglePlanningCalendarWorkWeekView.prototype.calculateStartDate = function (oDate) {
+		var oCalDate = CalendarDate.fromLocalJSDate(oDate),
 			oCalFirstDateOfWeek = CalendarUtils._getFirstDateOfWeek(oCalDate),
 			oLocaleData = this._getFormatSettingsLocaleData();
 
@@ -93,7 +93,7 @@ function(library, SinglePlanningCalendarView, Formatting, Locale, CalendarDate,
 	/**
 	 * Returns local data about the current locale.
 	 *
-	 * @return {LocaleData} the local data
+	 * @returns {LocaleData} the local data
 	 * @private
 	 */
 	SinglePlanningCalendarWorkWeekView.prototype._getFormatSettingsLocaleData = function () {

package/src/sap/m/SlideTile.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/Slider.js

@@ -104,7 +104,7 @@ function(
 		 * @borrows sap.ui.core.ISemanticFormContent.getFormRenderAsControl as #getFormRenderAsControl
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SliderTooltip.js

@@ -42,7 +42,7 @@ function(
 		 * @extends sap.m.SliderTooltipBase
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SliderTooltipBase.js

@@ -21,7 +21,7 @@ function(Control, Library, SliderTooltipBaseRenderer) {
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SliderTooltipContainer.js

@@ -39,7 +39,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SplitApp.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.SplitContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SplitButton.js

@@ -48,7 +48,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 *
 		 * @constructor
 		 * @private