@openui5/sap.m 1.105.1 → 1.107.0

package/src/sap/m/SinglePlanningCalendarDayView.js

@@ -25,7 +25,7 @@ function (library, SinglePlanningCalendarView) {
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarGrid.js

@@ -27,7 +27,8 @@ sap.ui.define([
 		"sap/ui/thirdparty/jquery",
 		'./PlanningCalendarLegend',
 		'sap/ui/core/InvisibleMessage',
-		'sap/ui/core/library'
+		'sap/ui/core/library',
+		"sap/ui/core/Configuration"
 	],
 	function (
 		SinglePlanningCalendarUtilities,
@@ -51,7 +52,8 @@ sap.ui.define([
 		jQuery,
 		PlanningCalendarLegend,
 		InvisibleMessage,
-		coreLibrary
+		coreLibrary,
+		Configuration
 	) {
 		"use strict";
 
@@ -100,7 +102,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.105.1
+		 * @version 1.107.0
 		 *
 		 * @constructor
 		 * @private
@@ -337,7 +339,9 @@ sap.ui.define([
 						}
 					}
 				}
-			}
+			},
+
+			renderer: SinglePlanningCalendarGridRenderer
 		});
 
 		SinglePlanningCalendarGrid.prototype.init = function () {
@@ -834,11 +838,11 @@ sap.ui.define([
 				drop: function (oEvent) {
 					var oDragSession = oEvent.getParameter("dragSession"),
 						oDropControl = oDragSession.getDropControl(),
-						iМillisecondsStep = (60 / (this.getScaleFactor() * 2)) * 60 * 1000, // calculating the duration of the appointment in milliseconds relative to the current scaleFactor
+						iMillisecondsStep = (60 / (this.getScaleFactor() * 2)) * 60 * 1000, // calculating the duration of the appointment in milliseconds relative to the current scaleFactor
 						oStartDate = oDragSession.getComplexData("startingDropDate").getTime(),
 						oEndDate = oDropControl.getDate().getJSDate().getTime(),
 						iStartTime = Math.min(oStartDate, oEndDate),
-						iEndTime = Math.max(oStartDate, oEndDate) + iМillisecondsStep;
+						iEndTime = Math.max(oStartDate, oEndDate) + iMillisecondsStep;
 
 					this.fireAppointmentCreate({
 						startDate: new Date(iStartTime),
@@ -875,7 +879,12 @@ sap.ui.define([
 				bAppStartIsOutsideVisibleStartHour,
 				bAppEndIsOutsideVisibleEndHour,
 				iRowHeight = this._getRowHeight(),
-				iRow = 0;
+				iRow = 0,
+				iVerticalPaddingBetweenAppointments = 0.125,
+				iAppointmentBottomPadding = 0.125,
+				iAppointmentTopPadding = 0.0625,
+				iScaleFactor = this.getScaleFactor(),
+				iDivider = 2 * iScaleFactor;
 
 			if (this._oAppointmentsToRender[sDate]) {
 				this._oAppointmentsToRender[sDate].oAppointmentsList.getIterator().forEach(function(oAppNode) {
@@ -891,7 +900,9 @@ sap.ui.define([
 
 					oAppDomRef.style["top"] = iAppTop + "rem";
 					oAppDomRef.style["bottom"] = iAppBottom  + "rem";
-					oAppDomRef.querySelector(".sapUiCalendarApp").style["minHeight"] = (iRowHeight / 2 - 0.1875) + "rem";
+
+					oAppDomRef.querySelector(".sapUiCalendarApp").style["minHeight"] = (iRowHeight - ((iVerticalPaddingBetweenAppointments + iAppointmentBottomPadding + iAppointmentTopPadding) * iScaleFactor)) / iDivider + "rem";
+
 					++iRow;
 				}.bind(this));
 			}
@@ -927,6 +938,10 @@ sap.ui.define([
 			}
 		};
 
+		SinglePlanningCalendarGrid.prototype._adjustRowHigth = function () {
+			this.$().find(".sapMSinglePCRow").css("height", this._getRowHeight() + "rem");
+		};
+
 		SinglePlanningCalendarGrid.prototype.onAfterRendering = function () {
 			var iColumns = this._getColumns(),
 				oStartDate = this.getStartDate(),
@@ -944,7 +959,7 @@ sap.ui.define([
 			} else {
 				this._adjustBlockersHeightforCozy();
 			}
-
+			this._adjustRowHigth();
 			this._updateRowHeaderAndNowMarker();
 			_initItemNavigation.call(this);
 		};
@@ -1921,7 +1936,7 @@ sap.ui.define([
 		 */
 		SinglePlanningCalendarGrid.prototype._getCoreLocaleId = function () {
 			if (!this._sLocale) {
-				this._sLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale().toString();
+				this._sLocale = Configuration.getFormatSettings().getFormatLocale().toString();
 			}
 
 			return this._sLocale;

package/src/sap/m/SinglePlanningCalendarGridRenderer.js

@@ -11,7 +11,8 @@ sap.ui.define([
 	'sap/ui/core/IconPool',
 	'sap/ui/core/InvisibleText',
 	'./PlanningCalendarLegend',
-	'sap/ui/unified/library'
+	'sap/ui/unified/library',
+	'sap/ui/core/Configuration'
 	],
 	function(
 		CalendarDate,
@@ -20,7 +21,8 @@ sap.ui.define([
 		IconPool,
 		InvisibleText,
 		PlanningCalendarLegend,
-		unifiedLibrary) {
+		unifiedLibrary,
+		Configuration) {
 		"use strict";
 
 		var iVerticalPaddingBetweenAppointments = 0.125;
@@ -186,7 +188,7 @@ sap.ui.define([
 				aAriaLabels = oControl.getAriaLabelledBy(),
 				iLeftPosition = iStartDayDiff * (100 / iColumns),
 				iRightPosition = (iColumns - iEndDayDiff - 1) * (100 / iColumns),
-				bIsRTL = sap.ui.getCore().getConfiguration().getRTL(),
+				bIsRTL = Configuration.getRTL(),
 				aClasses;
 
 			if (aAriaLabels.length > 0) {
@@ -227,7 +229,7 @@ sap.ui.define([
 				oRm.class("sapUiCalendarApp" + sType);
 			}
 			if (sColor) {
-				if (sap.ui.getCore().getConfiguration().getRTL()) {
+				if (Configuration.getRTL()) {
 					oRm.style("border-right-color", sColor);
 				} else {
 					oRm.style("border-left-color", sColor);
@@ -409,7 +411,6 @@ sap.ui.define([
 				oRm.openStart("div");
 				oRm.attr("role", "gridcell");
 				oRm.class("sapMSinglePCRow");
-				oRm.style("height", oControl._getRowHeight() + "rem");
 				if (!oControl._isVisibleHour(i)) {
 					oRm.class("sapMSinglePCNonWorkingRow");
 				}
@@ -544,7 +545,7 @@ sap.ui.define([
 				oRm.class("sapUiCalendarApp" + sType);
 			}
 			if (sColor) {
-				if (sap.ui.getCore().getConfiguration().getRTL()) {
+				if (Configuration.getRTL()) {
 					oRm.style("border-right-color", sColor);
 				} else {
 					oRm.style("border-left-color", sColor);
@@ -552,7 +553,7 @@ sap.ui.define([
 			}
 			oRm.style("top", iAppTop + "rem");
 			oRm.style("bottom", iAppBottom + "rem");
-			oRm.style(sap.ui.getCore().getConfiguration().getRTL() ? "right" : "left", iAppChunkWidth * iAppointmentLevel + "%");
+			oRm.style(Configuration.getRTL() ? "right" : "left", iAppChunkWidth * iAppointmentLevel + "%");
 			oRm.style("width", iAppChunkWidth * iAppointmentWidth + "%"); // TODO: take into account the levels
 			oRm.openEnd();
 

package/src/sap/m/SinglePlanningCalendarMonthGrid.js

@@ -83,7 +83,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.105.1
+		 * @version 1.107.0
 		 *
 		 * @constructor
 		 * @private
@@ -219,7 +219,9 @@ sap.ui.define([
 						}
 					}
 				}
-			}
+			},
+
+			renderer: SinglePlanningCalendarMonthGridRenderer
 		});
 
 		SinglePlanningCalendarMonthGrid.prototype.init = function() {
@@ -235,6 +237,8 @@ sap.ui.define([
 
 			this.setStartDate(new Date());
 			this._configureAppointmentsDragAndDrop();
+
+			this._oUnifiedRB = sap.ui.getCore().getLibraryResourceBundle("sap.ui.unified");
 		};
 
 		SinglePlanningCalendarMonthGrid.prototype.exit = function() {
@@ -335,13 +339,18 @@ sap.ui.define([
 		};
 
 		SinglePlanningCalendarMonthGrid.prototype._findSrcControl = function (oEvent) {
-			if (!oEvent.target.parentElement || !oEvent.target.parentElement.classList.contains("sapUiCalendarRowApps")) {
-				return oEvent.srcControl;
-			}
-
 			// 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 sAppointmentId = oEvent.target.parentElement.getAttribute("data-sap-ui-related");
+			var oTargetElement = oEvent.target,
+				oTargetsParentElement = oTargetElement.parentElement,
+				sAppointmentId;
+			if (!oTargetsParentElement || oTargetsParentElement.classList.contains("sapMSPCMonthDays")) {
+				return oEvent.srcControl;
+			} else if (oTargetsParentElement.classList.contains("sapUiCalendarRowApps")) {
+				sAppointmentId = oTargetsParentElement.getAttribute("data-sap-ui-related") || oTargetsParentElement.id;
+			} else {
+				sAppointmentId = oTargetElement.getAttribute("data-sap-ui-related") || oTargetElement.id;
+			}
 
 			// finding the appointment
 			return this.getAppointments().find(function (oAppointment) {

package/src/sap/m/SinglePlanningCalendarMonthView.js

@@ -28,7 +28,7 @@ sap.ui.define([
 		 * @extends sap.m.SinglePlanningCalendarView
 		 *
 		 * @author SAP SE
-		 * @version 1.105.1
+		 * @version 1.107.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SinglePlanningCalendarView.js

@@ -26,7 +26,7 @@ function (library, Log, Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarWeekView.js

@@ -9,9 +9,10 @@ sap.ui.define([
 	'./SinglePlanningCalendarView',
 	'sap/ui/core/LocaleData',
 	'sap/ui/unified/calendar/CalendarDate',
-	'sap/ui/unified/calendar/CalendarUtils'
+	'sap/ui/unified/calendar/CalendarUtils',
+	'sap/ui/core/Configuration'
 ],
-function (library, SinglePlanningCalendarView, LocaleData, CalendarDate, CalendarUtils) {
+function (library, SinglePlanningCalendarView, LocaleData, CalendarDate, CalendarUtils, Configuration) {
 	"use strict";
 
 	/**
@@ -28,7 +29,7 @@ function (library, SinglePlanningCalendarView, LocaleData, CalendarDate, Calenda
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
@@ -75,20 +76,19 @@ function (library, SinglePlanningCalendarView, LocaleData, CalendarDate, Calenda
 	 * @public
 	 */
 	SinglePlanningCalendarWeekView.prototype.calculateStartDate = function (oStartDate) {
-		var oCalDate = CalendarDate.fromLocalJSDate(oStartDate),
-			oCalFirstDateOfWeek = CalendarUtils._getFirstDateOfWeek(oCalDate),
-			oSPCStart = oCalFirstDateOfWeek.toLocalJSDate(),
-			iOldFirstDayOfWeek = oSPCStart.getDay(),
-			iResultFirstDayOfWeek = this.getFirstDayOfWeek(),
-			oLocaleData;
+		var oLocaleData = LocaleData.getInstance(Configuration.getFormatSettings().getFormatLocale()),
+			iFirstDayOfWeek = this.getFirstDayOfWeek(),
+			// -1 is the default value of firstDayOfWeek property. It means that the information from the used locale is used.
+			iCurrentFirstDayOfWeek = iFirstDayOfWeek === -1 ? oLocaleData.getFirstDayOfWeek() : iFirstDayOfWeek;
 
-		if (iResultFirstDayOfWeek === -1) { // -1 is the default value of firstDayOfWeek property. It means that the information from the used locale is used.
-			oLocaleData = LocaleData.getInstance(sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale());
-			iResultFirstDayOfWeek = oLocaleData.getFirstDayOfWeek();
-		}
-		oSPCStart.setDate(oSPCStart.getDate() - iOldFirstDayOfWeek + iResultFirstDayOfWeek);
+		oStartDate.setDate(oStartDate.getDate() - oStartDate.getDay() + iCurrentFirstDayOfWeek);
 
-		return oSPCStart;
+		return CalendarUtils
+			._getFirstDateOfWeek(CalendarDate.fromLocalJSDate(oStartDate), {
+				firstDayOfWeek: iFirstDayOfWeek,
+				minimalDaysInFirstWeek: oLocaleData.getMinimalDaysInFirstWeek()
+			})
+			.toLocalJSDate();
 	};
 
 	return SinglePlanningCalendarWeekView;

package/src/sap/m/SinglePlanningCalendarWorkWeekView.js

@@ -9,9 +9,10 @@ sap.ui.define([
 	'./SinglePlanningCalendarView',
 	'sap/ui/unified/calendar/CalendarDate',
 	'sap/ui/unified/calendar/CalendarUtils',
-	'sap/ui/core/LocaleData'
+	'sap/ui/core/LocaleData',
+	'sap/ui/core/Configuration'
 ],
-function (library, SinglePlanningCalendarView, CalendarDate, CalendarUtils, LocaleData) {
+function (library, SinglePlanningCalendarView, CalendarDate, CalendarUtils, LocaleData, Configuration) {
 	"use strict";
 
 	/**
@@ -28,7 +29,7 @@ function (library, SinglePlanningCalendarView, CalendarDate, CalendarUtils, Loca
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
@@ -95,7 +96,7 @@ function (library, SinglePlanningCalendarView, CalendarDate, CalendarUtils, Loca
 	 * @private
 	 */
 	SinglePlanningCalendarWorkWeekView.prototype._getFormatSettingsLocaleData = function () {
-		return LocaleData.getInstance(sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale());
+		return LocaleData.getInstance(Configuration.getFormatSettings().getFormatLocale());
 	};
 
 	return SinglePlanningCalendarWorkWeekView;

package/src/sap/m/SlideTile.js

@@ -12,7 +12,8 @@ sap.ui.define([
 	'./SlideTileRenderer',
 	"sap/ui/events/KeyCodes",
 	"sap/ui/events/PseudoEvents",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/core/Configuration"
 ],
 	function(
 		library,
@@ -22,7 +23,8 @@ sap.ui.define([
 		SlideTileRenderer,
 		KeyCodes,
 		PseudoEvents,
-		jQuery
+		jQuery,
+		Configuration
 	) {
 	"use strict";
 
@@ -39,12 +41,11 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @since 1.34
 	 *
 	 * @public
 	 * @alias sap.m.SlideTile
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var SlideTile = Control.extend("sap.m.SlideTile", /** @lends sap.m.SlideTile.prototype */ {
 		metadata: {
@@ -122,7 +123,9 @@ sap.ui.define([
 					}
 				}
 			}
-		}
+		},
+
+		renderer: SlideTileRenderer
 	});
 
 	/* --- Lifecycle Handling --- */
@@ -503,7 +506,7 @@ sap.ui.define([
 	SlideTile.prototype._scrollToTile = function (tileIndex) {
 		if (tileIndex >= 0) {
 			var oWrapperTo = this.$("wrapper-" + tileIndex);
-			var sDir = sap.ui.getCore().getConfiguration().getRTL() ? "right" : "left";
+			var sDir = Configuration.getRTL() ? "right" : "left";
 
 			this._changeSizeTo(tileIndex);
 			oWrapperTo.css(sDir, "0rem");
@@ -546,7 +549,7 @@ sap.ui.define([
 		}
 
 		oWrapperTo = this.$("wrapper-" + this._iCurrentTile);
-		sDir = sap.ui.getCore().getConfiguration().getRTL() ? "right" : "left";
+		sDir = Configuration.getRTL() ? "right" : "left";
 
 		var oCurrentTile = this.getTiles()[this._iCurrentTile];
 		if (oCurrentTile && oCurrentTile._isNavigateActionEnabled()) {