@openui5/sap.m 1.99.0 → 1.100.0

package/src/sap/m/CustomDynamicDateOption.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/m/DynamicDateOption'],
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/CustomListItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ListItemBase', './library', './CustomListItemRenderer'],
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomListItemRenderer.js

@@ -20,12 +20,10 @@ sap.ui.define(["./ListItemBaseRenderer", "sap/ui/core/Renderer"],
 	 * Renders the HTML for the given control, using the provided
 	 * {@link sap.ui.core.RenderManager}.
 	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *            oRenderManager the RenderManager that can be used for writing to
-	 *            the Render-Output-Buffer
-	 * @param {sap.m.CustomListItem}
-	 *            oControl an object representation of the control that should be
-	 *            rendered
+	 * @param {sap.ui.core.RenderManager} rm
+	 *            RenderManager that can be used to render the control's DOM
+	 * @param {sap.m.CustomListItem} oLI
+	 *            The item to be rendered
 	 */
 	CustomListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMCLI");

package/src/sap/m/CustomTile.js

@@ -21,7 +21,7 @@ sap.ui.define(['./Tile', './library', './CustomTileRenderer'],
 	 * Use the CustomTile control to display application specific content in the Tile control.
 	 * The tile width is 8.5em and height is 10em.
 	 * @extends sap.m.Tile
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CustomTileRenderer.js

@@ -34,7 +34,7 @@ sap.ui.define(['./TileRenderer', 'sap/ui/core/Renderer'],
 		}
 
 		/* WAI ARIA if in TileContainer context */
-		if (oControl.getParent() instanceof sap.m.TileContainer) {
+		if (oControl.getParent() && oControl.getParent().isA("sap.m.TileContainer")) {
 			// @ui5-non-local-rendering
 			oTileContainer = oControl.getParent();
 			aVisibleTiles = oTileContainer._getVisibleTiles();

package/src/sap/m/CustomTreeItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *        <code>Table, Form</code> etc, should not be aggregated as content.
 	 * @extends sap.m.TreeItemBase
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @constructor
 	 * @public
 	 * @since 1.48.0

package/src/sap/m/CustomTreeItemRenderer.js

@@ -18,8 +18,8 @@ sap.ui.define([
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
-	 * @param {sap.ui.core.RenderManager} oRenderManager RenderManager object
-	 * @param {sap.m.CustomTreeItem} oControl An object representation of the control that will be rendered
+	 * @param {sap.ui.core.RenderManager} rm RenderManager object
+	 * @param {sap.m.CustomTreeItem} oLI The item to be rendered
 	 */
 	CustomTreeItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMCTI");

package/src/sap/m/DatePicker.js

@@ -148,7 +148,7 @@ sap.ui.define([
 	 * the close event), or select Cancel.
 	 *
 	 * @extends sap.m.DateTimeField
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -1334,10 +1334,11 @@ sap.ui.define([
 		} else {
 			var oInitialFocusedDateValue = this.getInitialFocusedDateValue();
 			var oFocusDate = oInitialFocusedDateValue ? oInitialFocusedDateValue : new Date();
-			var iMaxTimeMillis = this._oMaxDate.getTime();
 
-			if (oFocusDate.getTime() < this._oMinDate.getTime() || oFocusDate.getTime() > iMaxTimeMillis) {
+			if (oFocusDate.getTime() < this._oMinDate.getTime()) {
 				oFocusDate = this._oMinDate;
+			} else if (oFocusDate.getTime() > this._oMaxDate.getTime()) {
+				oFocusDate = this._oMaxDate;
 			}
 			this._getCalendar().focusDate(oFocusDate);
 

package/src/sap/m/DateRangeSelection.js

@@ -126,8 +126,8 @@ sap.ui.define([
 	 * compact mode and provides a touch-friendly size in cozy mode.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.99.0
-	 * @version 1.99.0
+	 * @version 1.100.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimeField.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -308,7 +308,7 @@ sap.ui.define([
 			oDateLocal,
 			oDate;
 
-		if (oBindingType && this._isSupportedBindingType(oBindingType)) {
+		if (this._isSupportedBindingType(oBindingType)) {
 			try {
 				oDate = oBindingType.parseValue(sValue, "string");
 
@@ -352,7 +352,7 @@ sap.ui.define([
 			oFormatOptions,
 			oDateUTC;
 
-		if (oBindingType && this._isSupportedBindingType(oBindingType)) {
+		if (this._isSupportedBindingType(oBindingType)) {
 			if ((oBindingType.oFormatOptions && oBindingType.oFormatOptions.UTC) || (oBindingType.oConstraints && oBindingType.oConstraints.isDateOnly)) {
 				// convert to UTC date because it will be formatted as UTC date
 				oDateUTC = new Date(Date.UTC(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(),
@@ -378,7 +378,7 @@ sap.ui.define([
 	};
 
 	DateTimeField.prototype._isSupportedBindingType = function (oBindingType) {
-		return oBindingType.isA([
+		return !!oBindingType && oBindingType.isA([
 			"sap.ui.model.type.Date",
 			"sap.ui.model.odata.type.DateTime",
 			"sap.ui.model.odata.type.DateTimeOffset"

package/src/sap/m/DateTimeInput.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DateTimePicker.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	// shortcut for sap.m.PlacementType and sap.m.ButtonType
 	var PlacementType = library.PlacementType,
 		ButtonType = library.ButtonType,
-		// From sap.ui.Device.media.RANGESETS.SAP_STANDARD - "Phone": For screens smaller than 600 pixels.
+		// From Device.media.RANGESETS.SAP_STANDARD - "Phone": For screens smaller than 600 pixels.
 		STANDART_PHONE_RANGESET = "Phone",
 		CalendarType = coreLibrary.CalendarType;
 
@@ -145,7 +145,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -397,11 +397,40 @@ sap.ui.define([
 		this._bOnlyCalendar = false;
 	};
 
+	DateTimePicker.prototype.setValue = function(sValue) {
+		var sFallbackValue;
+
+		DatePicker.prototype.setValue.apply(this, arguments);
+
+		delete this._prefferedValue;
+
+		if (!this.getDateValue()) {
+			sFallbackValue = this._fallbackParse(sValue);
+
+			if (typeof sFallbackValue === "string") {
+				this._bValid = true;
+				this._prefferedValue = sFallbackValue;
+
+				// there is a re-render comming, but this updates the dom immediately to avoid flickering
+				if (this.getDomRef() && this._$input.val() !== sFallbackValue) {
+					this._$input.val(sFallbackValue);
+					this._curpos = this._$input.cursorPos();
+				}
+			}
+		}
+
+		return this;
+	};
+
 	DateTimePicker.prototype.setTimezone = function(sTimezone) {
 		var oCurrentDateValue,
 			sFormattedValue,
 			oNewDateValue;
 
+		if (this.getTimezone() === sTimezone) {
+			return this;
+		}
+
 		oCurrentDateValue = this.getDateValue() || this._parseValue(this.getValue(), false);
 		sFormattedValue = this._formatValue(oCurrentDateValue, false);
 
@@ -438,15 +467,15 @@ sap.ui.define([
 	DateTimePicker.prototype.onAfterRendering = function() {
 		if (this._getShowTimezone()) {
 			waitForThemeApplied().then(function() {
-				var oDummyContentDomRef = document.querySelector("#" + this.getId() + " .sapMDummyContent"),
+				var oDummyContentDomRef = this.$().find(".sapMDummyContent"),
 					iDummyWidth;
 
-				if (!oDummyContentDomRef) {
+				if (!oDummyContentDomRef || !oDummyContentDomRef.length) {
 					return;
 				}
 
-				iDummyWidth = oDummyContentDomRef.getBoundingClientRect().width;
-				jQuery("#" + this.getId() + "-inner").css("max-width", (iDummyWidth + 2) + "px");
+				iDummyWidth = oDummyContentDomRef[0].getBoundingClientRect().width;
+				this.$("inner").css("max-width", (iDummyWidth + 2) + "px");
 			}.bind(this));
 		}
 	};
@@ -597,11 +626,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * Gets the format options of the value or dateValue binding with timezone.
-	 * @returns {object} The binding format options or an empty object instance.
+	 * Gets the format options of the value or dateValue binding.
+	 * @returns {object} The binding format options or undefined.
 	 * @private
 	 */
-	DateTimePicker.prototype._getBindingWithTimezoneFormatOptions = function() {
+	DateTimePicker.prototype._getBindingFormatOptions = function() {
 		var oBinding = this.getBinding("value") || this.getBinding("dateValue"),
 			oBindingType;
 
@@ -609,7 +638,7 @@ sap.ui.define([
 			oBindingType = oBinding.getType();
 		}
 
-		if (oBindingType && oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"])) {
+		if (this._isSupportedBindingType(oBindingType)) {
 			return jQuery.extend({}, oBindingType.getFormatOptions());
 		}
 	};
@@ -623,13 +652,13 @@ sap.ui.define([
 	 * @private
 	 */
 	DateTimePicker.prototype._getTimezoneFormatOptions = function(bDisplayFormat) {
-		var oFormatOptions = this._getBindingWithTimezoneFormatOptions() || {},
+		var oFormatOptions = this._getBindingFormatOptions() || {},
 			sFormat = bDisplayFormat ? this.getDisplayFormat() : this.getValueFormat(),
 			oBinding = this.getBinding("value") || this.getBinding("dateValue"),
 			oBindingType = oBinding && oBinding.getType && oBinding.getType();
 
-		if (bDisplayFormat || !this._getTimezone()
-			|| (oBindingType && this._isSupportedBindingType(oBindingType))) {
+		if (bDisplayFormat || !this._getTimezone() ||
+			(oBindingType && !oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"]))) {
 			oFormatOptions.showTimezone = DateFormatTimezoneDisplay.Hide;
 		}
 
@@ -647,7 +676,7 @@ sap.ui.define([
 			oFormatOptions.strictParsing = true;
 		}
 
-		if (sFormat && (!oBinding || !oBindingType || !this._isSupportedBindingType(oBindingType))) {
+		if (sFormat && !this._isSupportedBindingType(oBindingType)) {
 			oFormatOptions[this._checkStyle(sFormat) ? "style" : "pattern"] = sFormat;
 		}
 
@@ -739,14 +768,10 @@ sap.ui.define([
 			oBindingType = oBinding && oBinding.getType(),
 			aDateWithTimezone;
 
-		if (oBindingType) {
-			if (oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"])) {
-				var aCurrentBindingValues = oBinding.getCurrentValues().slice(0);
-				aCurrentBindingValues[1] = sTimezone || this._getTimezone(true);
-				return oBindingType.parseValue(sValue, "string", aCurrentBindingValues)[0];
-			} else if (!bDisplayFormat && this._isSupportedBindingType(oBindingType)) {
-				return DatePicker.prototype._parseValue.apply(this, arguments);
-			}
+		if (oBindingType && oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"])) {
+			var aCurrentBindingValues = oBinding.getCurrentValues().slice(0);
+			aCurrentBindingValues[1] = sTimezone || this._getTimezone(true);
+			return oBindingType.parseValue(sValue, "string", aCurrentBindingValues)[0];
 		}
 
 		aDateWithTimezone = this._getFormatter(bDisplayFormat)
@@ -767,6 +792,24 @@ sap.ui.define([
 		return this._getFormatter(!bValueFormat).format(oDate, sTimezone || this._getTimezone(true));
 	};
 
+	/**
+	 * Tries to parse the value to see if it is a timezone only string.
+	 * @param {string} sValue A value string
+	 * @return {string|null} An empty string indicating success or null
+	 * @private
+	 */
+	DateTimePicker.prototype._fallbackParse = function(sValue) {
+		return this._getFallbackParser().parse(sValue) ? "" : null;
+	};
+
+	DateTimePicker.prototype._getFallbackParser = function() {
+		if (!this._fallbackParser) {
+			this._fallbackParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: "Only" });
+		}
+
+		return this._fallbackParser;
+	};
+
 	DateTimePicker.prototype._getLocaleBasedPattern = function(sPlaceholder) {
 		var oLocaleData = LocaleData.getInstance(
 				Core.getConfiguration().getFormatSettings().getFormatLocale()

package/src/sap/m/DateTimePickerRenderer.js

@@ -15,6 +15,14 @@ sap.ui.define(['sap/ui/core/Renderer', './DatePickerRenderer', './InputBaseRende
 
 	DateTimePickerRenderer.apiVersion = 2;
 
+	DateTimePickerRenderer.writeInnerValue = function(oRm, oControl) {
+		if (!oControl.getDateValue() && typeof oControl._prefferedValue === "string") {
+			oRm.attr("value", oControl._prefferedValue);
+		} else {
+			DatePickerRenderer.writeInnerValue.apply(this, arguments);
+		}
+	};
+
 	DateTimePickerRenderer.getDescribedByAnnouncement = function(oDP) {
 
 		var sBaseAnnouncement = InputBaseRenderer.getDescribedByAnnouncement.apply(this, arguments);
@@ -39,10 +47,9 @@ sap.ui.define(['sap/ui/core/Renderer', './DatePickerRenderer', './InputBaseRende
 
 		oRm.openStart("div", oControl.getId() + "-timezoneLabel");
 		oRm.class("sapMDTPTimezoneLabel");
-		oRm.attr("title", sTimezone);
 		oRm.openEnd();
 
-		oRm.openStart("span");
+		oRm.openStart("span", oControl.getId() + "-timezoneID");
 		oRm.openEnd();
 		oRm.text(sTimezone);
 		oRm.close("span");
@@ -70,6 +77,16 @@ sap.ui.define(['sap/ui/core/Renderer', './DatePickerRenderer', './InputBaseRende
 		}
 	};
 
+	DateTimePickerRenderer.getAriaDescribedBy = function(oControl) {
+		var sDescribedBy = InputBaseRenderer.getAriaDescribedBy.apply(this, arguments);
+
+		if (oControl._getShowTimezone()) {
+			sDescribedBy += " " + oControl.getId() + "-timezoneID";
+		}
+
+		return sDescribedBy;
+	};
+
 	return DateTimePickerRenderer;
 
 }, /* bExport= */ true);

package/src/sap/m/Dialog.js

@@ -175,7 +175,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.99.0
+		* @version 1.100.0
 		*
 		* @constructor
 		* @public

package/src/sap/m/DisplayListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DisplayListItemRenderer.js

@@ -24,12 +24,10 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 	 * Renders the HTML for the given control, using the provided
 	 * {@link sap.ui.core.RenderManager}.
 	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *          oRenderManager the RenderManager that can be used for writing to the
-	 *          Render-Output-Buffer
-	 * @param {sap.m.DisplayListItem}
-	 *          oControl an object representation of the control that should be
-	 *          rendered
+	 * @param {sap.ui.core.RenderManager} rm
+	 *          RenderManager that can be used to render the control's DOM
+	 * @param {sap.m.DisplayListItem} oLI
+	 *          The item to be rendered
 	 */
 	DisplayListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMDLI");

package/src/sap/m/DraftIndicator.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DynamicDate.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/DynamicDateFormat.js

@@ -124,7 +124,7 @@ sap.ui.define([
 		 * Create an instance of the DynamicDateFormat.
 		 *
 		 * @param {object} [oFormatOptions] Object which defines the format options
-		 * @param {{sap.ui.core.Locale}} [oLocale] Locale to get the formatter for
+		 * @param {sap.ui.core.Locale} [oLocale] Locale to get the formatter for
 		 * @return {sap.m.DynamicDateFormat} Instance of the DynamicDateFormat
 		 * @private
 		 */
@@ -143,6 +143,7 @@ sap.ui.define([
 			oFormat.oLocaleData = LocaleData.getInstance(oLocale);
 			oFormat.oOriginalFormatOptions = deepExtend({}, DynamicDateFormat.oDefaultDynamicDateFormat, oFormatOptions);
 			oFormat._dateFormatter = DateFormat.getInstance(oFormat.oOriginalFormatOptions["date"]);
+			oFormat._dateTimeFormatter = DateFormat.getDateTimeInstance(oFormat.oOriginalFormatOptions["datetime"]);
 			// hack the date formatter not to parse relative
 			// dates like: "next month", "next quarter", "previous week"
 			[oFormat._dateFormatter].concat(oFormat._dateFormatter.aFallbackFormats).forEach(function(f) {
@@ -151,7 +152,12 @@ sap.ui.define([
 				};
 			});
 
-			oFormat._dateTimeFormatter = DateFormat.getDateTimeInstance(oFormat.oOriginalFormatOptions["datetime"]);
+			[oFormat._dateTimeFormatter].concat(oFormat._dateTimeFormatter.aFallbackFormats).forEach(function(f) {
+				f.parseRelative = function() {
+					return null;
+				};
+			});
+
 			oFormat._monthFormatter = DateFormat.getInstance(oFormat.oOriginalFormatOptions["month"]);
 			oFormat._yearFormatter = DateFormat.getInstance(oFormat.oOriginalFormatOptions["year"]);
 			oFormat._numberFormatter = NumberFormat.getInstance(oFormat.oOriginalFormatOptions["int"]);

package/src/sap/m/DynamicDateOption.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/DynamicDateRange.js

@@ -35,8 +35,9 @@ sap.ui.define([
 	'./NavContainer',
 	'./DynamicDateRangeRenderer',
 	'./StandardDynamicDateOption',
-	'sap/ui/dom/jquery/Focusable',
-	'./library'],
+	'./library',
+	'sap/ui/thirdparty/jquery',
+	'sap/ui/dom/jquery/Focusable'], // provides jQuery.fn.firstFocusableDomRef
 	function(
 		InvisibleText,
 		Element,
@@ -67,8 +68,8 @@ sap.ui.define([
 		NavContainer,
 		DynamicDateRangeRenderer,
 		StandardDynamicDateOption,
-		Focusable,
-		library
+		library,
+		jQuery
 	) {
 		"use strict";
 
@@ -118,7 +119,7 @@ sap.ui.define([
 		 * is opened. The dialog is closed via a date time period value selection or by pressing the "Cancel" button.
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public
@@ -383,10 +384,13 @@ sap.ui.define([
 		};
 
 		DynamicDateRange.prototype.setValue = function(oValue) {
+			var sOptionKey = oValue && oValue.operator;
+
 			// substutude the semantically equivalent values
 			oValue = this._substitudeValue(oValue);
 
 			this.setProperty("value", oValue);
+			this._oSelectedOption = DynamicDateUtil.getOption(sOptionKey);
 
 			// Forward Dynamic Date Range control property values to inner sap.m.Input instance.
 			this._updateInputValue(oValue);
@@ -590,11 +594,13 @@ sap.ui.define([
 				switch (sType) {
 					case "datetime":
 						oFormatOptions = Object.create(this._getFormatter()._dateTimeFormatter.oFormatOptions);
+						oFormatOptions.singleIntervalValue = true;
 						oFormatOptions.interval = true;
 						this._oDatesLabelFormatter = DateFormat.getDateTimeInstance(oFormatOptions);
 						break;
 					default:
 						oFormatOptions = Object.create(this._getFormatter()._dateFormatter.oFormatOptions);
+						oFormatOptions.singleIntervalValue = true;
 						oFormatOptions.interval = true;
 						this._oDatesLabelFormatter = DateFormat.getInstance(oFormatOptions);
 				}
@@ -914,6 +920,10 @@ sap.ui.define([
 
 			aResultDates = DynamicDateUtil.toDates(oOutputValue);
 			if (aResultDates) {
+				if (this._oSelectedOption.getKey() === "FROMDATETIME" || this._oSelectedOption.getKey() === "TODATETIME"
+					|| this._oSelectedOption.getKey() === "FROM" || this._oSelectedOption.getKey() === "TO") {
+					aResultDates.push(null);
+				}
 				sFormattedDates = this._getDatesLabelFormatter().format(aResultDates);
 				this._getDatesLabel().setText(oResourceBundle.getText("DDR_INFO_DATES", [sFormattedDates]));
 			}
@@ -1076,7 +1086,7 @@ sap.ui.define([
 
 			if (oToPage === oOptionDetailsPage) {
 				this.aInputControls.forEach(function(oControl) {
-					if (jQuery(oControl.getDomRef()).firstFocusableDomRef()) {
+					if (oControl.$().firstFocusableDomRef()) {
 						oControl.addAriaLabelledBy && oControl.addAriaLabelledBy(oToPage.getAggregation("_internalHeader"));
 
 						if (!this._isCalendarBasedControl(oControl) && oControl.addAriaDescribedBy) {
@@ -1312,6 +1322,13 @@ sap.ui.define([
 				&& (!this._bClearButtonPressed);
 		};
 
+		DynamicDateRangeInput.prototype.onfocusin = function (oEvent) {
+			Input.prototype.onfocusin.apply(this, arguments);
+			if (this._getControlOrigin()._oPopup && this._getControlOrigin()._oPopup.isOpen()) {
+				this._getControlOrigin()._closePopup();
+			}
+		};
+
 		var DynamicDateRangeListItem = StandardListItem.extend("sap.m.DynamicDateRangeListItem", {
 			metadata: {
 				library: "sap.m",

package/src/sap/m/DynamicDateUtil.js

@@ -70,11 +70,10 @@ sap.ui.define([
 	];
 
 	/**
-	 * @class
 	 * The DynamicDateUtil is a utility class for working with the DynamicDateOption instances.
 	 *
+	 * @namespace
 	 * @alias sap.m.DynamicDateUtil
-	 * @static
 	 * @public
 	 * @experimental Since 1.92. This class is experimental and provides only limited functionality. Also the API might be changed in future.
 	 */

package/src/sap/m/DynamicDateValueHelpUIType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/ExpandableText.js

@@ -100,7 +100,7 @@ function(library,
 	 * @implements sap.ui.core.IFormContent, sap.m.IHyphenation
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilter.js

@@ -170,7 +170,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IShrinkable
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterItem.js

@@ -20,7 +20,7 @@ sap.ui.define(['./ListItemBase', './library', './FacetFilterItemRenderer'],
 	 * @class
 	 * Represents a value for the {@link sap.m.FacetFilterList} control.
 	 * @extends sap.m.ListItemBase
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterList.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * be closed.
 	 *
 	 * @extends sap.m.List
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -613,9 +613,11 @@ sap.ui.define([
 
 		// Checks whether given model is one of the OData Models
 		function isODataModel(oModel) {
-			return oModel instanceof sap.ui.model.odata.ODataModel ||
-				oModel instanceof sap.ui.model.odata.v2.ODataModel ||
-				oModel instanceof sap.ui.model.odata.v4.ODataModel;
+			return oModel && (
+				oModel.isA("sap.ui.model.odata.ODataModel") ||
+				oModel.isA("sap.ui.model.odata.v2.ODataModel") ||
+				oModel.isA("sap.ui.model.odata.v4.ODataModel")
+			);
 		}
 
 		if (force || (sSearchVal !== this._searchValue)) {

package/src/sap/m/FeedContent.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 1.34
 	 *
 	 * @public