@openui5/sap.ui.core 1.93.3 → 1.96.2

package/src/sap/ui/core/support/techinfo/TechnicalInfo.js

@@ -8,6 +8,7 @@ sap.ui.define([
 	"sap/ui/core/support/techinfo/moduleTreeHelper",
 	"sap/ui/Device",
 	"sap/ui/Global",
+	"sap/ui/VersionInfo",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/model/resource/ResourceModel",
 	"sap/ui/model/json/JSONModel",
@@ -20,11 +21,13 @@ sap.ui.define([
 	"sap/ui/util/Storage",
 	"sap/ui/core/syncStyleClass",
 	"sap/base/Log",
+	"sap/ui/core/Fragment",
 	"sap/ui/thirdparty/jquery"
 ], function(
 	moduleTreeHelper,
 	Device,
 	Global,
+	VersionInfo,
 	DateFormat,
 	ResourceModel,
 	JSONModel,
@@ -37,6 +40,7 @@ sap.ui.define([
 	Storage,
 	syncStyleClass,
 	Log,
+	Fragment,
 	jQuery
 ) {
 	"use strict";
@@ -68,8 +72,8 @@ sap.ui.define([
 		 * @param{function} fnCallback Callback that can be executed to fetch library and module information
 		 */
 		open: function (fnCallback) {
-			// early out if already open
-			if (this._oDialog && this._oDialog.isOpen()) {
+			// early out if already loading or open
+			if (this._pOpenDialog) {
 				return;
 			}
 
@@ -77,32 +81,45 @@ sap.ui.define([
 			this._oModuleSystemInfo = fnCallback() || {};
 
 			// create dialog lazily
-			if (!this._oDialog) {
-				this._oDialog = sap.ui.xmlfragment(this._TECHNICAL_INFO_DIALOG_ID, "sap.ui.core.support.techinfo.TechnicalInfo", this);
-			}
-
-			// refresh configuration data and open dialog
-			this._initialize();
-			this._oDialog.open();
+			this._loadAndInitialize().then(function() {
+				this._oDialog.open();
+				this._bIsBeingClosed = false;
+			}.bind(this));
 		},
 
 		/**
-		 * Closes the technical information dialog
+		 * Closes the technical information dialog.
 		 */
 		close: function() {
-			this._oDialog.close();
-			this._oDialog.destroy();
-			this._oDialog = null;
-
-			if (this._oAssistantPopover) {
-				this._oAssistantPopover.destroy();
-				this._oAssistantPopover = null;
+			if ( !this._pDestroyDialog ) {
+				this._bIsBeingClosed = true;
+				this._pDestroyDialog = Promise.all([
+					Promise.resolve(this._pAssistantPopover)
+						.then(function() {
+							if (this._oAssistantPopover) {
+								this._oAssistantPopover.destroy();
+								this._oAssistantPopover = null;
+							}
+							this._pAssistantPopover = null;
+						}.bind(this)),
+					Promise.resolve(this._pDebugPopover)
+						.then(function() {
+							if (this._oDebugPopover) {
+								this._oDebugPopover.destroy();
+								this._oDebugPopover = null;
+							}
+							this._pDebugPopover = null;
+						}.bind(this))
+				]).then(function() {
+					this._oDialog.close();
+					this._oDialog.destroy();
+					this._oDialog = null;
+					this._pOpenDialog = null;
+					this._pDestroyDialog = null;
+				}.bind(this));
 			}
 
-			if (this._oDebugPopover) {
-				this._oDebugPopover.destroy();
-				this._oDebugPopover = null;
-			}
+			return this._pDestroyDialog;
 		},
 
 		/* =========================================================== */
@@ -185,10 +202,11 @@ sap.ui.define([
 			this._updateTreeInfos();
 
 			// create dialog lazily
-			if (!this._oDebugPopover) {
-				this._oDebugPopover = sap.ui.xmlfragment(this._DEBUG_MODULES_ID, "sap.ui.core.support.techinfo.TechnicalInfoDebugDialog", this);
-				this._oDialog.addDependent(this._oDebugPopover);
-				syncStyleClass(this._getContentDensityClass(), this._oDialog, this._oDebugPopover);
+			this._loadDebugPopover().then(function() {
+				// out early if TechnicalInfo is closing
+				if (this._bIsBeingClosed) {
+					return;
+				}
 				var oControl = this._getControl("customDebugValue", this._DEBUG_MODULES_ID);
 				try {
 					this._validateCustomDebugValue(oControl.getValue());
@@ -196,13 +214,12 @@ sap.ui.define([
 					this._showError(oControl, oException.message);
 					return;
 				}
-			}
+				// adopt tree depth to the deepest currently selected module
+				this._getControl("tree", this._DEBUG_MODULES_ID).expandToLevel(Math.max(this._MIN_EXPAND_LEVEL_DEBUG_MODULES, oTreeResults.depth));
 
-			// adopt tree depth to the deepest currently selected module
-			this._getControl("tree", this._DEBUG_MODULES_ID).expandToLevel(Math.max(this._MIN_EXPAND_LEVEL_DEBUG_MODULES, oTreeResults.depth));
-
-			// open dialog
-			this._oDebugPopover.open();
+				// open dialog
+				this._oDebugPopover.open();
+			}.bind(this));
 		},
 
 		/**
@@ -411,36 +428,30 @@ sap.ui.define([
 				return;
 			}
 			// create dialog lazily
-			if (!this._oAssistantPopover) {
-				this._oAssistantPopover = sap.ui.xmlfragment(this._SUPPORT_ASSISTANT_POPOVER_ID, "sap.ui.core.support.techinfo.TechnicalInfoAssistantPopover", this);
-				this._oAssistantPopover.attachAfterOpen(this._onAssistantPopoverOpened, this);
-				this._oDialog.addDependent(this._oAssistantPopover);
-				syncStyleClass(this._getContentDensityClass(), this._oDialog, this._oAssistantPopover);
-
-				// register message validation and trigger it once to validate the value coming from local storage
-				var oCustomBootstrapURL =  this._getControl("customBootstrapURL", this._SUPPORT_ASSISTANT_POPOVER_ID);
-				sap.ui.getCore().getMessageManager().registerObject(oCustomBootstrapURL, true);
-
-			}
-
-			// enable or disable default option for version >= 1.48
-			var oCurrentItem = this._getControl("standardBootstrapURL", this._SUPPORT_ASSISTANT_POPOVER_ID).getItems()[0];
-			if (this._isVersionBiggerThanMinSupported()) {
-				var sAppVersion = sap.ui.getCore().getConfiguration().getVersion().toString();
-				oCurrentItem.setText(oCurrentItem.getText().replace("[[version]]", sAppVersion));
-				oCurrentItem.setEnabled(true);
-			} else {
-				oCurrentItem.setText(oCurrentItem.getText().replace("[[version]]", "not supported"));
-				oCurrentItem.setEnabled(false);
-			}
+			this._loadAssistantPopover().then(function() {
+				// out early if TechnicalInfo is closing
+				if (this._bIsBeingClosed) {
+					return;
+				}
+				// enable or disable default option for version >= 1.48
+				var oCurrentItem = this._getControl("standardBootstrapURL", this._SUPPORT_ASSISTANT_POPOVER_ID).getItems()[0];
+				if (this._isVersionBiggerThanMinSupported()) {
+					var sAppVersion = sap.ui.getCore().getConfiguration().getVersion().toString();
+					oCurrentItem.setText(oCurrentItem.getText().replace("[[version]]", sAppVersion));
+					oCurrentItem.setEnabled(true);
+				} else {
+					oCurrentItem.setText(oCurrentItem.getText().replace("[[version]]", "not supported"));
+					oCurrentItem.setEnabled(false);
+				}
 
-			var oModel = this._oDialog.getModel("view"),
-				sSelectedLocation = oModel.getProperty("/SelectedLocation");
+				var oModel = this._oDialog.getModel("view"),
+					sSelectedLocation = oModel.getProperty("/SelectedLocation");
 
-			this._setActiveLocations(sSelectedLocation);
+				this._setActiveLocations(sSelectedLocation);
 
-			var oSupportAssistantSettingsButton = this._getControl("supportAssistantSettingsButton", this._TECHNICAL_INFO_DIALOG_ID);
-			this._oAssistantPopover.openBy(oSupportAssistantSettingsButton);
+				var oSupportAssistantSettingsButton = this._getControl("supportAssistantSettingsButton", this._TECHNICAL_INFO_DIALOG_ID);
+				this._oAssistantPopover.openBy(oSupportAssistantSettingsButton);
+			}.bind(this));
 		},
 
 		/* =========================================================== */
@@ -581,8 +592,33 @@ sap.ui.define([
 				});
 		},
 
-		/**
-		 * Initalizes the technical information dialog
+		_loadAndInitialize: function() {
+			// create dialog lazily
+			this._pOpenDialog =
+				Promise.all([
+					sap.ui.getCore().loadLibraries(["sap.ui.core", "sap.ui.layout", "sap.m"]),
+					this._loadVersionInfo(),
+					this._pDestroyDialog // wait for a pending destroy to finish
+				]).then(function() {
+					return Fragment.load({
+						id: this._TECHNICAL_INFO_DIALOG_ID,
+						name: "sap.ui.core.support.techinfo.TechnicalInfo",
+						controller: this
+					});
+				}.bind(this)).then(function(oDialog) {
+					this._oDialog = oDialog;
+					// refresh configuration data and open dialog
+					return this._initialize();
+				}.bind(this)).then(function() {
+					this._oDialog.open();
+					this._bIsBeingClosed = false;
+				}.bind(this));
+
+			return this._pOpenDialog;
+		},
+
+		/**
+		 * Initalizes the technical information dialog.
 		 * @private
 		 */
 		_initialize: function () {
@@ -597,6 +633,18 @@ sap.ui.define([
 			this._oDialog.addStyleClass(this._getContentDensityClass());
 		},
 
+		_loadVersionInfo: function() {
+			return VersionInfo.load().catch(function(err) {
+				Log.error("failed to load global version info", err);
+				return {
+					name: "",
+					version: ""
+				};
+			}).then(function(oVersionInfo) {
+				this._oVersionInfo = oVersionInfo;
+			}.bind(this));
+		},
+
 		/**
 		 * Initializes the view model with the current runtime information
 		 * @private
@@ -623,23 +671,16 @@ sap.ui.define([
 			});
 
 			// load version info into view model
-			var oVersionInfo = {};
-			try {
-				oVersionInfo = Global.getVersionInfo();
-				oViewModel.setProperty("/ProductName", oVersionInfo.name);
-				oViewModel.setProperty("/ProductVersion", oVersionInfo.version);
-			} catch (oException) {
-				oVersionInfo.version = "";
-				Log.error("failed to load global version info");
-			}
+			oViewModel.setProperty("/ProductName", this._oVersionInfo.name);
+			oViewModel.setProperty("/ProductVersion", this._oVersionInfo.version);
 
 			try {
-				oViewModel.setProperty("/ProductTimestamp", this._generateLocalizedBuildDate(oVersionInfo.buildTimestamp));
+				oViewModel.setProperty("/ProductTimestamp", this._generateLocalizedBuildDate(this._oVersionInfo.buildTimestamp));
 			} catch (oException) {
 				Log.error("failed to parse build timestamp from global version info");
 			}
 
-			if (!/openui5/i.test(oVersionInfo.name)) {
+			if (!/openui5/i.test(this._oVersionInfo.name)) {
 				oViewModel.setProperty("/OpenUI5ProductVersion", Global.version);
 				// convert build timestamp
 				try {
@@ -651,7 +692,7 @@ sap.ui.define([
 
 			var sAppVersion;
 			try {
-				sAppVersion = this._getText("TechInfo.SupportAssistantConfigPopup.AppVersionOption", oVersionInfo.version);
+				sAppVersion = this._getText("TechInfo.SupportAssistantConfigPopup.AppVersionOption", this._oVersionInfo.version);
 			} catch (oException) {
 				sAppVersion = "Application";
 			}
@@ -940,6 +981,42 @@ sap.ui.define([
 			oModel.setProperty("/DebugModuleSelectionCount", this._treeHelper.getSelectionCount(oTreeData));
 			sDisplayCount = oModel.getProperty("/DebugModuleSelectionCount").toString();
 			oModel.setProperty("/DebugModulesTitle", this._getText("TechInfo.DebugModulesConfigPopup.SelectionCounter", sDisplayCount));
+		},
+
+		_loadDebugPopover: function() {
+			// create dialog lazily
+			if (!this._pDebugPopover) {
+				this._pDebugPopover = Fragment.load({
+					id: this._DEBUG_MODULES_ID,
+					name: "sap.ui.core.support.techinfo.TechnicalInfoDebugDialog",
+					controller: this
+				}).then(function(oDebugPopover) {
+					this._oDebugPopover = oDebugPopover;
+					this._oDialog.addDependent(this._oDebugPopover);
+					syncStyleClass(this._getContentDensityClass(), this._oDialog, this._oDebugPopover);
+				}.bind(this));
+			}
+			return this._pDebugPopover;
+		},
+
+		_loadAssistantPopover: function() {
+			if (!this._pAssistantPopover) {
+				this._pAssistantPopover = Fragment.load({
+					id: this._SUPPORT_ASSISTANT_POPOVER_ID,
+					name: "sap.ui.core.support.techinfo.TechnicalInfoAssistantPopover",
+					controller: this
+				}).then(function(oAssistantPopover) {
+					this._oAssistantPopover = oAssistantPopover;
+					this._oAssistantPopover.attachAfterOpen(this._onAssistantPopoverOpened, this);
+					this._oDialog.addDependent(this._oAssistantPopover);
+					syncStyleClass(this._getContentDensityClass(), this._oDialog, this._oAssistantPopover);
+
+					// register message validation and trigger it once to validate the value coming from local storage
+					var oCustomBootstrapURL =  this._getControl("customBootstrapURL", this._SUPPORT_ASSISTANT_POPOVER_ID);
+					sap.ui.getCore().getMessageManager().registerObject(oCustomBootstrapURL, true);
+				}.bind(this));
+			}
+			return this._pAssistantPopover;
 		}
 	};
 });

package/src/sap/ui/core/themes/base/Icon.less

@@ -9,6 +9,7 @@
 	display: inline-block;
 	vertical-align: baseline;
 	line-height: 1;
+	position: relative;
 }
 
 .sapUiIconPointer {
@@ -28,6 +29,14 @@
 	-webkit-font-smoothing: antialiased;
 }
 
+.sapUiIcon > .sapUiIconTitle {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	left: 0;
+	top: 0;
+}
+
 /*
  * The mirroring of icon is done on the pesudo element and not the root DOM.
  * Because:

package/src/sap/ui/core/theming/Parameters.js

@@ -631,6 +631,8 @@ sap.ui.define([
 		/**
 		 * <p>
 		 * Returns the current value for one or more theming parameters, depending on the given arguments.
+		 * The synchronous usage of this API has been deprecated and only the asynchronous usage should still be used
+		 * (see the 4th bullet point and the code examples below).
 		 * </p>
 		 *
 		 * <p>
@@ -651,9 +653,9 @@ sap.ui.define([
 		 * <p>
 		 * The following API variants are available (see also the below examples):
 		 * <ul>
-		 * <li> <b>(deprecated since 1.92)<b> If no parameter is given a key-value map containing all parameters is returned</li>
-		 * <li>If a <code>string</code> is given as first parameter the value is returned as a <code>string</code></li>
-		 * <li>If an <code>array</code> is given as first parameter a key-value map containing all parameters from the <code>array</code> is returned</li>
+		 * <li> <b>(deprecated since 1.92)</b> If no parameter is given a key-value map containing all parameters is returned</li>
+		 * <li> <b>(deprecated since 1.94)</b> If a <code>string</code> is given as first parameter the value is returned as a <code>string</code></li>
+		 * <li> <b>(deprecated since 1.94)</b> If an <code>array</code> is given as first parameter a key-value map containing all parameters from the <code>array</code> is returned</li>
 		 * <li>If an <code>object</code> is given as first parameter the result is returned immediately in case all parameters are loaded and available or within the callback in case not all CSS files are already loaded.
 		 * This is the <b>only asynchronous</b> API variant. This variant is the preferred way to retrieve theming parameters.
 		 * The structure of the return value is the same as listed above depending on the type of the name property within the <code>object</code>.</li>
@@ -772,7 +774,7 @@ sap.ui.define([
 
 				Log.warning(
 					"Legacy variant usage of sap.ui.core.theming.Parameters.get API detected for parameter(s): '" + aNames.join(", ") +
-					"'. This could lead to bad performance and sync XHR as parameters might not be available, yet. Use asynchronous variant instead.",
+					"'. This could lead to bad performance and additional synchronous XHRs, as parameters might not be available yet. Use asynchronous variant instead.",
 					"LegacyParametersGet",
 					"sap.ui.support",
 					function() { return { type: "LegacyParametersGet" }; }

package/src/sap/ui/core/tmpl/DOMAttribute.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/core/Element', 'sap/ui/core/library'],
 	 * @class
 	 * Represents a DOM attribute of a DOM element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @since 1.15

package/src/sap/ui/core/tmpl/DOMElement.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * Represents a DOM element. It allows to use databinding for the properties and nested DOM attributes.
 	 * @extends sap.ui.core.Control
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @since 1.15

package/src/sap/ui/core/tmpl/HandlebarsTemplate.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.tmpl.Template
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @alias sap.ui.core.tmpl.HandlebarsTemplate
 	 * @since 1.15
 	 * @deprecated since 1.56

package/src/sap/ui/core/tmpl/Template.js

@@ -13,7 +13,9 @@ sap.ui.define([
 	'sap/base/util/ObjectPath',
 	'sap/base/Log',
 	'sap/base/assert',
-	'sap/ui/thirdparty/jquery'
+	'sap/ui/thirdparty/jquery',
+	'sap/ui/core/tmpl/TemplateControl',
+	'./_parsePath'
 ],
 function(
 	ManagedObject,
@@ -23,7 +25,9 @@ function(
 	ObjectPath,
 	Log,
 	assert,
-	jQuery
+	jQuery,
+	TemplateControl,
+	parsePath
 ) {
 	"use strict";
 
@@ -48,7 +52,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @alias sap.ui.core.tmpl.Template
 	 * @since 1.15
 	 * @deprecated since 1.56, use an {@link sap.ui.core.mvc.XMLView XMLView} or {@link sap.ui.core.mvc.JSView JSView} instead.
@@ -170,28 +174,7 @@ function(
 	 * @protected
 	 * @static
 	 */
-	Template.parsePath = function(sPath) {
-
-		// TODO: wouldn't this be something central in ManagedObject?
-
-		// parse the path
-		var sModelName,
-			iSeparatorPos = sPath.indexOf(">");
-
-		// if a model name is specified in the binding path
-		// we extract this binding path
-		if (iSeparatorPos > 0) {
-			sModelName = sPath.substr(0, iSeparatorPos);
-			sPath = sPath.substr(iSeparatorPos + 1);
-		}
-
-		// returns the path information
-		return {
-			path: sPath,
-			model: sModelName
-		};
-
-	};
+	Template.parsePath = parsePath;
 
 	/*
 	 * overridden to prevent instantiation of Template
@@ -240,7 +223,6 @@ function(
 			var oMetadata = this.createMetadata(),
 				fnRenderer = this.createRenderer(),
 				that = this;
-			var TemplateControl = sap.ui.requireSync('sap/ui/core/tmpl/TemplateControl');
 			TemplateControl.extend(sControl, {
 
 				// the new control metadata
@@ -281,7 +263,6 @@ function(
 	Template.prototype.createControl = function(sId, oContext, oView) {
 
 		// create the anonymous control instance
-		var TemplateControl = sap.ui.requireSync('sap/ui/core/tmpl/TemplateControl');
 		var oControl = new TemplateControl({
 			id: sId,
 			template: this,
@@ -597,7 +578,8 @@ function(
 			}
 
 			// require and instantiate the proper template
-			var fnClass = sap.ui.requireSync(sClass.replace(/\./g, "/"));
+			var fnClass = sap.ui.requireSync(sClass.replace(/\./g, "/")); // legacy-relevant: Template is deprecated since 1.56 and XMLView should be used instead
+
 			fnClass = fnClass || ObjectPath.get(sClass || "");
 
 			// create a new instance of the template

package/src/sap/ui/core/tmpl/TemplateControl.js

@@ -10,8 +10,8 @@ sap.ui.define([
 	'sap/ui/core/DeclarativeSupport',
 	'sap/ui/core/UIArea',
 	'./DOMElement',
-	'./Template',
 	"./TemplateControlRenderer",
+	"./_parsePath",
 	"sap/base/strings/capitalize",
 	"sap/base/strings/hyphenate",
 	"sap/base/Log",
@@ -23,8 +23,8 @@ sap.ui.define([
 		DeclarativeSupport,
 		UIArea,
 		DOMElement,
-		Template,
 		TemplateControlRenderer,
+		parsePath,
 		capitalize,
 		hyphenate,
 		Log,
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @class
 	 * This is the base class for all template controls. Template controls are declared based on templates.
 	 * @extends sap.ui.core.Control
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @since 1.15
@@ -263,7 +263,7 @@ sap.ui.define([
 	TemplateControl.prototype.bind = function(sPath, sType) {
 
 		// parse the path and create the binding
-		var oPathInfo = Template.parsePath(sPath),
+		var oPathInfo = parsePath(sPath),
 			oModel = this.getModel(oPathInfo.model),
 			sPath = oPathInfo.path,
 			sModelFunc = sType ? "bind" + capitalize(sType) : "bindProperty",

package/src/sap/ui/core/tmpl/_parsePath.js

@@ -0,0 +1,35 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([], function() {
+	"use strict";
+
+	/**
+	 * Parses the given path and extracts the model and path
+	 *
+	 * @param {string} sPath the path
+	 * @return {object} the model and the path
+	 */
+	return function(sPath) {
+		// TODO: wouldn't this be something central in ManagedObject?
+
+		// parse the path
+		var sModelName,
+			iSeparatorPos = sPath.indexOf(">");
+
+		// if a model name is specified in the binding path
+		// we extract this binding path
+		if (iSeparatorPos > 0) {
+			sModelName = sPath.substr(0, iSeparatorPos);
+			sPath = sPath.substr(iSeparatorPos + 1);
+		}
+
+		// returns the path information
+		return {
+			path: sPath,
+			model: sModelName
+		};
+	};
+});

package/src/sap/ui/core/util/AsyncHintsHelper.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @class Utility class for asyncHints
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/util/DraftEnabledMockServer.js

@@ -4,11 +4,10 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/util/MockServer",
 	"sap/ui/thirdparty/jquery",
 	"sap/base/util/isEmptyObject",
 	"jquery.sap.sjax"
-], function(MockServer, jQuery, isEmptyObject /*, jQuerySapSjax*/) {
+], function(jQuery, isEmptyObject /*, jQuerySapSjax*/) {
 	"use strict";
 	return {
 
@@ -69,6 +68,7 @@ sap.ui.define([
 					}
 				}
 			};
+			var MockServer = sap.ui.require("sap/ui/core/util/MockServer");
 			if (oAnnotations && oAnnotations.EntityContainer) {
 				var oEntitySetsAnnotations = oAnnotations.EntityContainer[Object.keys(oAnnotations.EntityContainer)[0]];
 				//iterate over entitysets annotations
@@ -161,6 +161,7 @@ sap.ui.define([
 		 */
 		_prepareDraftMetadata: function(mEntitySets) {
 			var that = this;
+			var MockServer = sap.ui.require("sap/ui/core/util/MockServer");
 			this._oDraftMetadata.draftNodes = [];
 			this._oDraftMetadata.draftRootKey = mEntitySets[this._oDraftMetadata.draftRootName].keys.filter(function(x) {
 				return that._calcSemanticKeys(that._oDraftMetadata.draftRootName, mEntitySets).indexOf(x) < 0;
@@ -401,6 +402,7 @@ sap.ui.define([
 
 		setRequests: function(aRequests) {
 			var that = this;
+			var MockServer = sap.ui.require("sap/ui/core/util/MockServer");
 			aRequests.push({
 				method: "POST",
 				path: new RegExp(that._oDraftMetadata.draftRootActivationName),
@@ -610,20 +612,21 @@ sap.ui.define([
 		},
 
 		_generateMockdata: function(mEntitySets, sBaseUrl) {
-
+			var MockServer = sap.ui.require("sap/ui/core/util/MockServer");
 			MockServer.prototype._generateMockdata.apply(this, [mEntitySets, sBaseUrl]);
 
 			this._handleDraftArtifacts(mEntitySets);
 		},
 
 		_loadMockdata: function(mEntitySets, sBaseUrl) {
-
+			var MockServer = sap.ui.require("sap/ui/core/util/MockServer");
 			MockServer.prototype._loadMockdata.apply(this, [mEntitySets, sBaseUrl]);
 
 			this._handleDraftArtifacts(mEntitySets);
 		},
 
 		_resolveNavigation: function(sEntitySetName, oFromRecord, sNavProp, oEntry) {
+			var MockServer = sap.ui.require("sap/ui/core/util/MockServer");
 			var aEntries = MockServer.prototype._resolveNavigation.apply(this, [sEntitySetName, oFromRecord, sNavProp, oEntry]);
 			if (sNavProp === this._oConstants.SIBLINGENTITY_NAVIGATION) {
 				if (oEntry && oEntry.IsActiveEntity) {
@@ -644,12 +647,14 @@ sap.ui.define([
 		},
 
 		_findEntitySets: function(oMetadata) {
+			var MockServer = sap.ui.require("sap/ui/core/util/MockServer");
 			var mEntitySets = MockServer.prototype._findEntitySets.apply(this, [oMetadata]);
 			this._prepareDraftMetadata(mEntitySets);
 			return mEntitySets;
 		},
 
 		getEntitySetData: function(sEntitySet) {
+			var MockServer = sap.ui.require("sap/ui/core/util/MockServer");
 			var aEntitySet = MockServer.prototype.getEntitySetData.apply(this, [sEntitySet]);
 			var fnGetParameter = function() {
 				return aEntitySet;

package/src/sap/ui/core/util/Export.js

@@ -141,7 +141,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @since 1.22.0
 	 *
 	 * @public