@openui5/sap.m 1.108.1 → 1.109.0

package/src/sap/m/PlanningCalendar.js

@@ -185,7 +185,7 @@ sap.ui.define([
 	 * {@link sap.m.PlanningCalendarView PlanningCalendarView}'s properties.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public
@@ -384,6 +384,13 @@ sap.ui.define([
 				 */
 				primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null},
 
+				/**
+				 * If set, the days are also displayed in this calendar type
+				 * If not set, the dates are only displayed in the primary calendar type
+				 * @since 1.109.0
+				 */
+				secondaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null},
+
 				/**
 				 * Determines whether the selection of multiple appointments is enabled.
 				 *
@@ -825,8 +832,7 @@ sap.ui.define([
 	PlanningCalendar.prototype.onBeforeRendering = function(){
 
 		this._bBeforeRendering = true;
-
-		this._getHeader().setProperty("_primaryCalendarType", this.getPrimaryCalendarType());
+		this._updateHeader();
 
 		// init interval if default one is used
 		this._adjustViewKey();
@@ -849,6 +855,16 @@ sap.ui.define([
 
 	};
 
+	PlanningCalendar.prototype._updateHeader = function () {
+		this._getHeader().setProperty("_primaryCalendarType", this.getPrimaryCalendarType());
+		if (this._getSecondaryCalendarType()) {
+			this.setShowDayNamesLine(true);
+			this._getHeader().setProperty("_secondaryCalendarType", this.getSecondaryCalendarType());
+		}
+
+		return this;
+	};
+
 	PlanningCalendar.prototype.attachEvent = function (eventId, data, functionToCall, listener) {
 		Control.prototype.attachEvent.call(this, eventId, data, functionToCall, listener);
 		if (this.hasListeners("intervalSelect")) {
@@ -858,6 +874,7 @@ sap.ui.define([
 				}
 			}, this);
 		}
+
 		return this;
 	};
 
@@ -950,13 +967,14 @@ sap.ui.define([
 	};
 
 	/**
-	 * Creates and formats a string to be displayed in the picker button from the _header aggregation.
+	 * Creates and formats the strings to be displayed in the picker button from the _header aggregation.
 	 * If the date part of the start and end range of the showed view are different, the string contains
 	 * info about the current date. Otherwise, the result string shows info about a date range.
-	 * @returns {string} The concatenated string to be displayed
+	 * @returns {Object} The concatenated strings to be displayed
 	 * @private
 	 */
 	PlanningCalendar.prototype._formatPickerText = function () {
+
 		var oRangeDates = this._getFirstAndLastRangeDate(),
 			oStartDate = CalendarUtils._createLocalDate(oRangeDates.oStartDate, true),
 			oEndDate = CalendarUtils._createLocalDate(oRangeDates.oEndDate, true),
@@ -966,7 +984,15 @@ sap.ui.define([
 			oDateFormat,
 			sResult,
 			sBeginningResult,
-			sEndResult;
+			sEndResult,
+			oDateFormatInSecType,
+			sBeginnigDateResultInSecType,
+			sEndResultInSecType,
+			sResultInSecType;
+
+		if (this._getSecondaryCalendarType()) {
+			oDateFormatInSecType = DateFormat.getDateInstance({ format: "yMMMMd", calendarType: this.getSecondaryCalendarType() });
+		}
 
 		switch (sViewType) {
 			case CalendarIntervalType.Hour:
@@ -975,6 +1001,14 @@ sap.ui.define([
 				if (oStartDate.getDate() !== oEndDate.getDate()) {
 					sEndResult = oDateFormat.format(oEndDate);
 				}
+
+				if (this._getSecondaryCalendarType()){
+					sBeginnigDateResultInSecType = oDateFormatInSecType.format(oStartDate);
+					if (oStartDate.getDate() !== oEndDate.getDate()) {
+						sEndResultInSecType = oDateFormatInSecType.format(oEndDate);
+					}
+				}
+
 				break;
 
 			case CalendarIntervalType.Day:
@@ -990,6 +1024,11 @@ sap.ui.define([
 					oDateFormat = DateFormat.getDateInstance({ format: "yMMMMd", calendarType: this.getPrimaryCalendarType() });
 					sBeginningResult = oDateFormat.format(oStartDate);
 					sEndResult = oDateFormat.format(oEndDate);
+					if (this._getSecondaryCalendarType()) {
+						sBeginnigDateResultInSecType = oDateFormatInSecType.format(oStartDate);
+						sEndResultInSecType = oDateFormatInSecType.format(oEndDate);
+					}
+
 				}
 
 				break;
@@ -998,13 +1037,26 @@ sap.ui.define([
 			case "OneMonth":
 				oDateFormat = DateFormat.getDateInstance({format: "yMMMM", calendarType: this.getPrimaryCalendarType()});
 				sBeginningResult = oDateFormat.format(oStartDate);
+				if (this._getSecondaryCalendarType()) {
+					oDateFormatInSecType = DateFormat.getDateInstance({format: "yMMMM", calendarType: this.getSecondaryCalendarType()});
+					sBeginnigDateResultInSecType = oDateFormatInSecType.format(oStartDate);
+				}
 				break;
 
 			case CalendarIntervalType.Month:
 				oDateFormat = DateFormat.getDateInstance({format: "y", calendarType: this.getPrimaryCalendarType()});
 				sBeginningResult = oDateFormat.format(oStartDate);
+
+				if (this._getSecondaryCalendarType()) {
+					oDateFormatInSecType = DateFormat.getDateInstance({format: "y", calendarType: this.getSecondaryCalendarType()});
+					sBeginnigDateResultInSecType = oDateFormatInSecType.format(oStartDate);
+				}
+
 				if (oStartDate.getFullYear() !== oEndDate.getFullYear()) {
 					sEndResult = oDateFormat.format(oEndDate);
+					if (this._getSecondaryCalendarType()) {
+						sEndResultInSecType = oDateFormatInSecType.format(oEndDate);
+					}
 				}
 
 				if (sBeginningResult === sEndResult) {
@@ -1018,18 +1070,28 @@ sap.ui.define([
 
 		if (!bRTL) {
 			sResult = sBeginningResult;
+			sResultInSecType = sBeginnigDateResultInSecType;
 			if (sEndResult) {
 				sResult += " - " + sEndResult;
 			}
+
+			if (this._getSecondaryCalendarType() && sEndResultInSecType) {
+				sResultInSecType += " - " + sEndResultInSecType;
+			}
 		} else {
 			if (sEndResult) {
 				sResult = sEndResult + " - " + sBeginningResult;
 			} else {
 				sResult = sBeginningResult;
 			}
+			if (this._getSecondaryCalendarType() && sEndResultInSecType) {
+				sResultInSecType = sBeginnigDateResultInSecType + " - " + sEndResultInSecType;
+			} else if (this._getSecondaryCalendarType()) {
+				sResultInSecType = sBeginnigDateResultInSecType;
+			}
 		}
 
-		return sResult;
+		return { primaryType: sResult, secondaryType: sResultInSecType };
 	};
 
 	/**
@@ -1438,6 +1500,56 @@ sap.ui.define([
 		return this;
 	};
 
+	PlanningCalendar.prototype._getSecondaryCalendarType = function() {
+		var sSecondaryCalendarType;
+
+		if (this._bSecondaryCalendarTypeSet) {
+			sSecondaryCalendarType = this.getSecondaryCalendarType();
+
+			if (sSecondaryCalendarType === this.getPrimaryCalendarType()) {
+				sSecondaryCalendarType = undefined;
+			}
+		}
+
+		return sSecondaryCalendarType;
+	};
+
+	/**
+	 * Sets the secondaryCalendarType.
+	 * @param {sap.ui.core.CalendarType} sSecondaryCalendarType the <code>sap.ui.core.CalendarType</code> to set as <code>sap.m.PlanningCalendar</code> <code>secondaryCalendarType</code>.
+	 * @returns {this} <code>this</code> to allow method chaining
+	 * @public
+	 */
+	PlanningCalendar.prototype.setSecondaryCalendarType = function (sSecondaryCalendarType) {
+		if (this.getProperty("primaryCalendarType") ===  sSecondaryCalendarType) {
+			return this;
+		}
+
+
+		this.setProperty("secondaryCalendarType", sSecondaryCalendarType);
+		this._bSecondaryCalendarTypeSet = true;
+		if (this._getHeader()) {
+			this._getHeader().setProperty("_secondaryCalendarType", sSecondaryCalendarType);
+		}
+		if (this._oTimesRow) {
+			this._oTimesRow.setProperty("secondaryCalendarType", sSecondaryCalendarType);
+		}
+		if (this._oDatesRow) {
+			this._oDatesRow.setSecondaryCalendarType(sSecondaryCalendarType);
+		}
+		if (this._oMonthsRow) {
+			this._oMonthsRow.setProperty("secondaryCalendarType", sSecondaryCalendarType);
+		}
+		if (this._oWeeksRow) {
+			this._oWeeksRow.setSecondaryCalendarType(sSecondaryCalendarType);
+		}
+		if (this._oOneMonthsRow) {
+			this._oOneMonthsRow.setSecondaryCalendarType(sSecondaryCalendarType);
+		}
+
+		return this;
+	};
+
 	PlanningCalendar.prototype.setMinDate = function(oDate){
 
 		if (deepEqual(oDate, this.getMinDate())) {
@@ -1477,7 +1589,7 @@ sap.ui.define([
 				Log.warning("StartDate < minDate -> StartDate set to minDate", this);
 				oStartDate = new Date(oDate.getTime());
 				this.setStartDate(oStartDate);
-				oHeader.setPickerText(this._formatPickerText());
+				oHeader.updatePickerText(this._formatPickerText());
 			}
 		} else {
 			this.setProperty("minDate", undefined, true);
@@ -1541,7 +1653,7 @@ sap.ui.define([
 					oStartDate.setFullYear(1);
 				}
 				this.setStartDate(oStartDate);
-				oHeader.setPickerText(this._formatPickerText());
+				oHeader.updatePickerText(this._formatPickerText());
 			}
 		} else {
 			this.setProperty("maxDate", undefined, true);
@@ -1597,6 +1709,7 @@ sap.ui.define([
 		var oMaxDate = this.getMaxDate();
 		var oView = this._getView(sKey, !this._bBeforeRendering);
 		var oAssociation;
+		var sSecondaryCalendarType = this._getSecondaryCalendarType();
 
 		if (!oView) {
 			this._bCheckView = true;
@@ -1716,6 +1829,9 @@ sap.ui.define([
 							legend: this.getLegend()
 						});
 						this._oMonthsRow.setProperty("primaryCalendarType", this.getPrimaryCalendarType());
+						if (sSecondaryCalendarType) {
+							this._oMonthsRow.setProperty("secondaryCalendarType", sSecondaryCalendarType);
+						}
 						this._setAriaRole(this._oMonthsRow);
 						this._oMonthsRow._setLegendControlOrigin(this);
 						this._oMonthsRow.attachEvent("focus", this._handleFocus, this);
@@ -1749,6 +1865,12 @@ sap.ui.define([
 				oContent.setPrimaryCalendarType(this.getPrimaryCalendarType());
 			}
 
+			if (sSecondaryCalendarType && oContent.getMetadata().hasProperty("_secondaryCalendarType") ) {
+				oContent.setProperty("_secondaryCalendarType", sSecondaryCalendarType);
+			} else if (sSecondaryCalendarType && oContent.getMetadata().hasProperty("secondaryCalendarType") ) {
+				oContent.setSecondaryCalendarType(sSecondaryCalendarType);
+			}
+
 			if (this._oOneMonthsRow) {
 				this._oOneMonthsRow.setPrimaryCalendarType(this.getPrimaryCalendarType());
 			}
@@ -1930,7 +2052,7 @@ sap.ui.define([
 	 */
 	PlanningCalendar.prototype._shiftStartDate = function(oStartDate){
 		if (this.getViewKey() === PlanningCalendarBuiltInView.Week) {
-			/* Calculates the first week's datei for the given oStartDate. Have in mind that the oStartDate is the date that
+			/* Calculates the first week's date for the given oStartDate. Have in mind that the oStartDate is the date that
 			 * the user sees in the UI, thus - local one. As CalendarUtils.getFirstDateOfWeek works with UTC dates (this
 			 * is because the dates are timezone irrelevant), it should be called with the local datetime values presented
 			 * as UTC ones(e.g. if oStartDate is 21 Dec 1981, 13:00 GMT+02:00, it will be converted to 21 Dec 1981, 13:00 GMT+00:00)
@@ -1985,7 +2107,7 @@ sap.ui.define([
 			oPicker.addSelectedDate(oSelectedRange);
 		}
 
-		this._getHeader().setPickerText(this._formatPickerText());
+		this._getHeader().updatePickerText(this._formatPickerText());
 		this._updateTodayButtonState();
 	};
 
@@ -2958,7 +3080,7 @@ sap.ui.define([
 					var oFocusedDate = new Date(oEvtSelectedStartCalendarDate.toLocalJSDate().getTime());
 					if (CalendarUtils.monthsDiffer(this.getStartDate(), oEvtSelectedStartCalendarDate.toLocalJSDate())) {
 						this.setStartDate(oEvtSelectedStartCalendarDate.toLocalJSDate());
-						this._getHeader().setPickerText(this._formatPickerText());
+						this._getHeader().updatePickerText(this._formatPickerText());
 					}
 					this._setRowsStartDate(oFocusedDate);
 					this._oOneMonthsRow._focusDate(CalendarDate.fromLocalJSDate(oFocusedDate, this.getPrimaryCalendarType()), true);
@@ -3628,8 +3750,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Detaches the attached functions from the PlanningCalendarRowTimeline instance that corresponts to the row and
-	 * destorys the corresponding PlanningCalendarRowListItem.
+	 * Detaches the attached functions from the PlanningCalendarRowTimeline instance that corresponds to the row and
+	 * destroys the corresponding PlanningCalendarRowListItem.
 	 *
 	 * @param oRow
 	 * @private
@@ -3792,7 +3914,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Represents timeline that holds the appointments and intervals indide the PlanningCalendarRowListItem
+	 * Represents timeline that holds the appointments and intervals inside the PlanningCalendarRowListItem
 	 */
 	var PlanningCalendarRowTimeline = CalendarRow.extend("sap.m._PlanningCalendarRowTimeline", {
 		metadata: {

package/src/sap/m/PlanningCalendarHeader.js

@@ -12,6 +12,7 @@ sap.ui.define([
 	'./Toolbar',
 	'./AssociativeOverflowToolbar',
 	'./Button',
+	'./AdditionalTextButton',
 	'./Popover',
 	'./Title',
 	'./ToolbarSpacer',
@@ -34,6 +35,7 @@ function(
 	Toolbar,
 	AssociativeOverflowToolbar,
 	Button,
+	AdditionalTextButton,
 	Popover,
 	Title,
 	ToolbarSpacer,
@@ -92,7 +94,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @private
@@ -123,13 +125,26 @@ function(
 				 */
 				pickerText : { type : "string", group : "Data" },
 
+				/**
+				 * Determines the additional text of the button which opens the calendar picker.
+				 */
+				pickerTextInSecondaryType : { type : "string", group : "Data" },
+
 				/**
 				 * If set, the calendar type is used for display.
 				 * If not set, the calendar type of the global configuration is used.
 				 * @private
 				 * @since 1.108.0
 				 */
-				_primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null}
+				_primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null},
+
+				/**
+				 * If set, the days are also displayed in this calendar type
+				 * If not set, the dates are only displayed in the primary calendar type
+				 * @privates
+				 * @since 1.109.0
+				 */
+				_secondaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null}
 
 			},
 
@@ -333,8 +348,9 @@ function(
 		this.setAggregation("_indexPicker", oIndexPicker);
 		this._oIndexPicker = oIndexPicker;
 
-		this._oPickerBtn = new Button(sNavToolbarId + "-PickerBtn", {
+		this._oPickerBtn = new AdditionalTextButton(sNavToolbarId + "-PickerBtn", {
 			text: this.getPickerText(),
+			additionalText: this.getPickerTextInSecondaryType(),
 			ariaHasPopup: coreLibrary.aria.HasPopup.Dialog,
 			ariaLabelledBy: InvisibleText.getStaticId("sap.m", "PCH_SELECT_RANGE"),
 			press: function () {
@@ -395,10 +411,13 @@ function(
 
 	PlanningCalendarHeader.prototype.onBeforeRendering = function () {
 		var bVisible = !!this.getActions().length || !!this.getTitle() || this._getOrCreateViewSwitch().getItems().length > 1;
-
+		var sSecondaryCalendarType = this.getProperty("_secondaryCalendarType");
 		this._getActionsToolbar().setProperty("visible", bVisible, true);
 
 		this.setPrimaryCalendarTypeToPickers(this.getProperty("_primaryCalendarType"));
+		if (sSecondaryCalendarType){
+			this.setSecondaryCalendarTypeToPickers(sSecondaryCalendarType);
+		}
 	};
 
 	PlanningCalendarHeader.prototype.setTitle = function (sTitle) {
@@ -458,7 +477,26 @@ function(
 		return this;
 	};
 
+	PlanningCalendarHeader.prototype.updatePickerText = function (oPickerTextInfo) {
+		if (!oPickerTextInfo) {
+			return this;
+		}
+		this.setPickerText(oPickerTextInfo.primaryType);
+		this.setPickerTextInSecondaryType(oPickerTextInfo.secondaryType);
+
+		return true;
+	};
+
+	PlanningCalendarHeader.prototype.setPickerTextInSecondaryType = function (sAdditionalText){
+		this.setProperty("pickerTextInSecondaryType", sAdditionalText);
+		this._oPickerBtn.setAdditionalText(sAdditionalText);
+		return this;
+	};
+
 	PlanningCalendarHeader.prototype.setPickerText = function (sText) {
+		if (!sText) {
+			return this;
+		}
 		this.setProperty("pickerText", sText);
 		this._oPickerBtn.setText(sText);
 
@@ -471,6 +509,12 @@ function(
 		this._oYearPicker.setPrimaryCalendarType(sCalendarType);
 	};
 
+	PlanningCalendarHeader.prototype.setSecondaryCalendarTypeToPickers = function (sCalendarType) {
+		this._oCalendar.setSecondaryCalendarType(sCalendarType);
+		this._oMonthPicker.setSecondaryCalendarType(sCalendarType);
+		this._oYearPicker.setSecondaryCalendarType(sCalendarType);
+	};
+
 	/**
 	 * If not existing yet, creates the inner Title control.
 	 * Otherwise just returns it.

package/src/sap/m/PlanningCalendarLegend.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/unified/CalendarLegend', 'sap/ui/unified/CalendarAppointm
 		 * @extends sap.ui.unified.CalendarLegend
 		 *
 		 * @author SAP SE
-		 * @version 1.108.1
+		 * @version 1.109.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/PlanningCalendarRow.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * The <code>sap.m.PlanningCalendarRow</code> allows you to modify appointments at row level.
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/PlanningCalendarView.js

@@ -25,7 +25,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/library'],
 	 * The <code>PlanningCalendarView</code> defines the type of the intervals (hours, days, months)
 	 * and how many intervals are displayed.
 	 * @extends sap.ui.core.Element
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Popover.js

@@ -28,8 +28,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/Configuration",
 	"sap/ui/dom/jquery/Focusable", // jQuery Plugin "firstFocusableDomRef", "lastFocusableDomRef"
-	"sap/ui/dom/jquery/rect", // jQuery Plugin "rect"
-	"sap/ui/dom/jquery/control" // jQuery Plugin "control"
+	"sap/ui/dom/jquery/rect" // jQuery Plugin "rect"
 ],
 	function(
 		Bar,
@@ -121,7 +120,7 @@ sap.ui.define([
 		* @extends sap.ui.core.Control
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.108.1
+		* @version 1.109.0
 		*
 		* @public
 		* @alias sap.m.Popover
@@ -147,6 +146,7 @@ sap.ui.define([
 
 					/**
 					 * If a header should be shown at the top of the popover.
+					 * *Note:* The heading level of the popover is H1. Headings in the popover content should start with H2 heading level.
 					 */
 					showHeader: {type: "boolean", group: "Appearance", defaultValue: true},
 
@@ -490,8 +490,7 @@ sap.ui.define([
 
 			this._oRestoreFocusDelegate = {
 				onBeforeRendering: function () {
-					var $ActiveElement = jQuery(document.activeElement),
-						oActiveControl = $ActiveElement.control(0);
+					var oActiveControl = Element.closestTo(document.activeElement);
 					this._sFocusControlId = oActiveControl && oActiveControl.getId();
 				},
 				onAfterRendering: function () {
@@ -1568,15 +1567,13 @@ sap.ui.define([
 				} else {
 					this._calcBestPos();
 				}
-			} else {
-				if (this._checkVertical()) {
+			} else if (this._checkVertical()) {
 					this._calcVertical();
 				} else if (this._checkHorizontal()) {
 					this._calcHorizontal();
 				} else {
 					this._calcBestPos();
 				}
-			}
 
 		};
 
@@ -1855,8 +1852,7 @@ sap.ui.define([
 			if (bExceedHorizontal) {
 				iLeft = oPosParams._fPopoverMarginLeft;
 				iRight = oPosParams._fPopoverMarginRight;
-			} else {
-				if (bOverLeft) {
+			} else if (bOverLeft) {
 					iLeft = oPosParams._fPopoverMarginLeft;
 					if (bRtl) {
 						// when only one side of the popover goes beyond the defined border make sure that
@@ -1871,21 +1867,18 @@ sap.ui.define([
 					// can't react to content size change when both are set
 					iLeft = "";
 				}
-			}
 
 			if (bExceedVertical) {
 				iTop = oPosParams._fPopoverMarginTop;
 				iBottom = oPosParams._fPopoverMarginBottom;
-			} else {
-				if (bOverTop) {
-					iTop = oPosParams._fPopoverMarginTop;
-				} else if (bOverBottom) {
-					iBottom = oPosParams._fPopoverMarginBottom;
-					// when only one side of the popover goes beyond the defined border make sure that
-					// only one from the iLeft and iRight is set because Popover has a fixed size and
-					// can't react to content size change when both are set
-					iTop = "";
-				}
+			} else if (bOverTop) {
+				iTop = oPosParams._fPopoverMarginTop;
+			} else if (bOverBottom) {
+				iBottom = oPosParams._fPopoverMarginBottom;
+				// when only one side of the popover goes beyond the defined border make sure that
+				// only one from the iLeft and iRight is set because Popover has a fixed size and
+				// can't react to content size change when both are set
+				iTop = "";
 			}
 
 			var mPosition = {
@@ -2228,11 +2221,9 @@ sap.ui.define([
 		Popover.prototype._getAnyHeader = function () {
 			if (this.getCustomHeader()) {
 				return this.getCustomHeader();
-			} else {
-				if (this.getShowHeader()) {
-					this._createInternalHeader();
-					return this._internalHeader;
-				}
+			} else if (this.getShowHeader()) {
+				this._createInternalHeader();
+				return this._internalHeader;
 			}
 		};
 
@@ -2463,7 +2454,7 @@ sap.ui.define([
 			if (!this._headerTitle) {
 				this._headerTitle = new Title(this.getId() + "-title", {
 					text: this.getTitle(),
-					level: "H2"
+					level: "H1"
 				});
 
 				this._createInternalHeader();
@@ -2677,7 +2668,7 @@ sap.ui.define([
 		};
 
 		Popover.prototype.destroyAggregation = function (sAggregationName, bSuppressInvalidate) {
-			var oActiveControl = jQuery(document.activeElement).control(0);
+			var oActiveControl = Element.closestTo(document.activeElement);
 			if (sAggregationName === "beginButton" || sAggregationName === "endButton") {
 				var sButton = this["_" + sAggregationName];
 				if (sButton) {

package/src/sap/m/ProgressIndicator.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public
@@ -342,15 +342,16 @@ sap.ui.define([
 			this._fPercentValueDiff = this.getPercentValue() - fPercentValue;
 			this.setProperty("percentValue", fPercentValue);
 
-			if (!oProgressIndicatorDomRef) {
-				return this;
-			}
-
 			["sapMPIValueMax", "sapMPIValueMin", "sapMPIValueNormal", "sapMPIValueGreaterHalf"].forEach(function (sClass){
 				that.removeStyleClass(sClass);
 			});
 
 			this.addStyleClass(this._getCSSClassByPercentValue(fPercentValue).join(" "));
+
+			if (!oProgressIndicatorDomRef) {
+				return this;
+			}
+
 			oProgressIndicatorDomRef.setAttribute("aria-valuenow", fPercentValue);
 			oProgressIndicatorDomRef.setAttribute("aria-valuetext", this._getAriaValueText({fPercent: fPercentValue}));
 

package/src/sap/m/PullToRefresh.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickView.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.QuickViewBase
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewBase.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewCard.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.QuickViewBase
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/QuickViewGroup.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	* @extends sap.ui.core.Element
 	*
 	* @author SAP SE
-	* @version 1.108.1
+	* @version 1.109.0
 	*
 	* @constructor
 	* @public

package/src/sap/m/QuickViewGroupElement.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	* @extends sap.ui.core.Element
 	*
 	* @author SAP SE
-	* @version 1.108.1
+	* @version 1.109.0
 	*
 	* @constructor
 	* @public