@openui5/sap.ui.core 1.125.0 → 1.126.0

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.0
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/performance/trace/FESR.js

@@ -25,7 +25,7 @@ sap.ui.define([
 		ROOT_ID = Passport.getRootId(), // static per session
 		HOST = window.location.host, // static per session
 		CLIENT_OS = Device.os.name + "_" + Device.os.version,
-		CLIENT_MODEL = Device.browser.name + "_" + Device.browser.version,
+		CLIENT_MODEL = Device.browser.reportingName + "_" + Device.browser.version,
 		CLIENT_DEVICE = setClientDevice(),
 		sAppVersion = "", // shortened app version with fesr delimiter e.g. "@1.7.1"
 		sAppVersionFull = "", // full app version e.g. 1.7.1-SNAPSHOT
@@ -57,7 +57,7 @@ sap.ui.define([
 	}
 
 	function isCORSRequest(sUrl) {
-		var sHost = new URI(sUrl).host();
+		var sHost = new URI(sUrl.toString()).host();
 		// url is relative or with same host
 		return sHost && sHost !== HOST;
 	}

package/src/sap/ui/performance/trace/Interaction.js

@@ -38,7 +38,7 @@ sap.ui.define([
 		iResetCurrentBrowserEventTimer;
 
 	function isCORSRequest(sUrl) {
-		var sHost = new URI(sUrl).host();
+		var sHost = new URI(sUrl.toString()).host();
 		// url is relative or with same host
 		return sHost && sHost !== HOST;
 	}

package/src/sap/ui/performance/trace/Passport.js

@@ -188,7 +188,7 @@ sap.ui.define(["sap/ui/performance/XHRInterceptor", "sap/ui/thirdparty/URI"], fu
 	};
 
 	function isCORSRequest(sUrl) {
-		var sHost = new URI(sUrl).host();
+		var sHost = new URI(sUrl.toString()).host();
 		// url is relative or with same host
 		return sHost && sHost !== HOST;
 	}

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -30,7 +30,7 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/generic/TestBase.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.0
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

package/src/sap/ui/test/starter/_utils.js

@@ -9,11 +9,11 @@
  * Code other than the Core tests must not yet introduce dependencies to this module.
  */
 
-/*global sap */
 sap.ui.define([
+	"sap/base/util/isPlainObject",
 	"sap/base/util/merge",
 	"sap/ui/thirdparty/URI"
-], function(merge, URI) {
+], function(isPlainObject, merge, URI) {
 	"use strict";
 
 	// ---- helpers ----
@@ -215,7 +215,22 @@ sap.ui.define([
 				oTestDefaults = {
 					name: name
 				};
-			oTestConfig = merge({}, oSuiteDefaults, oTestDefaults, oTestConfig);
+
+			const mergeConfigObjects = (...aConfigs) => {
+				const oResult = merge({}, aConfigs.shift());
+
+				while (aConfigs.length) {
+					const oTmp = aConfigs.shift();
+					for (const sKey in oTmp) {
+						oResult[sKey] = isPlainObject(oResult[sKey]) ? mergeConfigObjects(oResult[sKey], oTmp[sKey]) : oTmp[sKey];
+					}
+				}
+
+				return oResult;
+			};
+
+			oTestConfig = mergeConfigObjects(oSuiteDefaults, oTestDefaults, oTestConfig);
+
 			if ( Array.isArray(oTestConfig.module) ) {
 				oTestConfig.module  = oTestConfig.module.map(function(sModule) {
 					return resolvePackage(resolvePlaceholders(sModule, name));

package/src/sap/ui/util/Mobile.js

@@ -150,10 +150,13 @@ sap.ui.define(['sap/ui/Device', 'sap/base/Log', 'sap/base/util/extend', 'sap/ui/
 					content: sMeta
 				});
 
-				// Update Device API resize info, which is necessary in some scenarios after setting the viewport info
-				if ((iInnerHeightBefore !== window.innerHeight || iInnerWidthBefore !== window.innerWidth) && Device.resize._update){
-					Device.resize._update();
-				}
+				// Mobile browsers update the window dimension with a delay after the 'viewport' meta tag is set
+				setTimeout(() => {
+					// Update Device API resize info, which is necessary in some scenarios after setting the viewport info
+					if ((iInnerHeightBefore !== window.innerHeight || iInnerWidthBefore !== window.innerWidth) && Device.resize._update){
+						Device.resize._update();
+					}
+				}, 50);
 			}
 
 			if (options.useFullScreenHeight) {

package/src/sap/ui/util/Storage.js

@@ -277,7 +277,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.125.0
+	 * @version 1.126.0
 	 */
 	Storage.Type = {
 		/**

package/src/ui5loader-autoconfig.js

@@ -702,33 +702,8 @@
 			mCache = Object.create(null);
 		}
 
-		/**
-		 * Returns a writable base configuration instance
-		 * @returns {module:sap/base/config/_Configuration} The writable base configuration
-		 */
-		function getWritableBootInstance() {
-			var oProvider = aProvider[0];
-
-			return {
-				set: function(sName, vValue) {
-					var rValidKey = /^[a-z][A-Za-z0-9]*$/;
-					if (rValidKey.test(sName)) {
-						oProvider.set(sName, vValue);
-						invalidate();
-					} else {
-						throw new TypeError(
-							"Invalid configuration key '" + sName + "'!"
-						);
-					}
-				},
-				get: get,
-				Type: TypeEnum
-			};
-		}
-
 		var Configuration = {
 			get: get,
-			getWritableBootInstance: getWritableBootInstance,
 			registerProvider: registerProvider,
 			Type: TypeEnum,
 			_: {

package/test/sap/ui/core/BindableResponseHeaders.html

@@ -189,12 +189,11 @@
 			json: true,
 			useBatch: false
 		});
-		sap.ui.getCore().setModel(oModel);
-
 
 		var oLayout = new sap.ui.layout.VerticalLayout({
 			width: "100%"
 		});
+		oLayout.setModel(oModel);
 		oLayout.placeAt("content");
 		oLayout.bindAggregation("content", {
 			path: "/Products",

package/test/sap/ui/core/ODataV2CanonicalRequests.html

@@ -14,6 +14,7 @@
 	<script>
 
 		sap.ui.require([
+			'sap/ui/core/Core',
 			'sap/ui/core/Messaging',
 			'sap/ui/core/util/MockServer',
 			'sap/ui/model/odata/v2/ODataModel',
@@ -33,8 +34,9 @@
 			'sap/m/Label',
 			'sap/m/Table',
 			'sap/ui/model/json/JSONModel'
-		], function (Messaging, MockServer, ODataModel, Filter, ResponsiveSplitter, SplitPane, PaneContainer, VerticalLayout,
-			HorizontalLayout, Column, ColumnListItem, Text, SimpleForm, Button, Panel, Input, Label, Table, JSONModel) {
+		], function (Core, Messaging, MockServer, ODataModel, Filter, ResponsiveSplitter, SplitPane, PaneContainer,
+			VerticalLayout, HorizontalLayout, Column, ColumnListItem, Text, SimpleForm, Button, Panel, Input, Label,
+			Table, JSONModel) {
 
 				var sServiceUri = "/SalesOrderSrv/";
 				var sDataRootPath = "qunit/testdata/SalesOrder/";
@@ -205,9 +207,6 @@
 					defaultCountMode: "None",
 					canonicalRequests: true
 				});
-				sap.ui.getCore().setModel(oModel);
-
-				sap.ui.getCore().setModel(Messaging.getMessageModel(), "message");
 				var oTableMM = new Table({
 					items: {
 						path: 'message>/',
@@ -473,6 +472,10 @@
 				oPanel2.placeAt("content");
 				oPanel3.placeAt("content");
 				oPanel4.placeAt("content");
+				Core.ready(() => {
+					oPanel.getUIArea().setModel(oModel);
+					oPanel.getUIArea().setModel(Messaging.getMessageModel(), "message");
+				});
 			});
 	</script>
 

package/test/sap/ui/core/ODataV2Messages.html

@@ -38,6 +38,9 @@
 			'sap/ui/codeeditor/CodeEditor'
 		], function (Messaging, MockServer, ODataModel, ResponsiveSplitter, SplitPane, PaneContainer, VerticalLayout, HorizontalLayout, Item, Column, ColumnListItem, Text, Input, Label, Select, Button, Table, Panel, JSONModel, CodeEditor) {
 
+			// 0. Create root control
+			var oSplitter = new ResponsiveSplitter();
+
 			// 1. Mocking
 			var sServiceUri = "/SalesOrderSrv/";
 			var sDataRootPath = "qunit/testdata/SalesOrder/";
@@ -70,7 +73,7 @@
 				]
 			};
 			var oMessageContainerModel = new JSONModel(oMessages);
-			sap.ui.getCore().setModel(oMessageContainerModel, "bMessages");
+			oSplitter.setModel(oMessageContainerModel, "bMessages");
 
 			aRequests.forEach(function (oRequest) {
 				var fnOrginalResponse;
@@ -80,12 +83,12 @@
 						var fnOrignalXHRRespond = oXhr.respond;
 						oXhr.respond = function (status, headers, content) {
 
-							var oObject = sap.ui.getCore().getModel("bMessages").getObject("/");
+							var oObject = oSplitter.getModel("bMessages").getObject("/");
 							if (oObject) {
 								headers["sap-message"] = JSON.stringify(oObject);
 							}
 
-							var aHistoryModel = sap.ui.getCore().getModel("history");
+							var aHistoryModel = oSplitter.getModel("history");
 							var aHistory = aHistoryModel.getObject("/");
 							aHistory.push({url: oXhr.url.replace("/SalesOrderSrv", "")});
 							aHistoryModel.setData(aHistory);
@@ -145,9 +148,9 @@
 				icon: "sap-icon://paper-plane",
 				press: function(){
 					if (oResponseEditor.getValue()){
-						sap.ui.getCore().getModel("bMessages").setData(JSON.parse(oResponseEditor.getValue()));
+						oSplitter.getModel("bMessages").setData(JSON.parse(oResponseEditor.getValue()));
 					} else {
-						sap.ui.getCore().getModel("bMessages").setData(undefined);
+						oSplitter.getModel("bMessages").setData(undefined);
 					}
 					oODataModel.read(oEntitySelect.getSelectedItem().getText());
 				}
@@ -158,14 +161,14 @@
 				icon: "sap-icon://delete",
 				press: function(){
 					Messaging.removeAllMessages();
-					var aHistoryModel = sap.ui.getCore().getModel("history");
+					var aHistoryModel = oSplitter.getModel("history");
 					aHistoryModel.setData([]);
 				}
 			});
 
 
 			// 4. Show front-end messages
-			sap.ui.getCore().setModel(Messaging.getMessageModel(), "message");
+			oSplitter.setModel(Messaging.getMessageModel(), "message");
 
 			var oTableMM = new Table({
 				items: {
@@ -203,7 +206,7 @@
 			// 5. Show call history
 
 			var oHistoryModel = new JSONModel([]);
-			sap.ui.getCore().setModel(oHistoryModel, "history");
+			oSplitter.setModel(oHistoryModel, "history");
 
 			var oHistoryTable = new Table({
 				items: {
@@ -226,8 +229,8 @@
 
 
 			// 6. Add content
-			var oSplitter = new ResponsiveSplitter({
-				rootPaneContainer: new PaneContainer({
+			oSplitter.setRootPaneContainer(
+				new PaneContainer({
 					panes: [
 						new SplitPane({content:
 							new VerticalLayout({content: [
@@ -242,7 +245,7 @@
 						new SplitPane({content: oMessageModelPanel})
 					]
 				})
-			});
+			);
 			oSplitter.placeAt("content");
 		});
 	</script>

package/test/sap/ui/core/ODataV2MessagesPerf.html

@@ -19,8 +19,9 @@
 			'sap/ui/model/json/JSONModel',
 			'sap/ui/model/odata/ODataPropertyBinding',
 			'sap/ui/table/Table',
-			'sap/m/Text',
 			'sap/m/Button',
+			'sap/m/Label',
+			'sap/m/Text',
 			'sap/base/util/merge',
 			'sap/ui/performance/Measurement'
 		], function(
@@ -29,8 +30,9 @@
 			JSONModel,
 			ODataPropertyBinding,
 			Table,
-			Text,
 			Button,
+			Label,
+			Text,
 			merge,
 			Measurement
 		) {
@@ -82,10 +84,8 @@
 			// create an ODataModel from URL
 			var oModel = new ODataModel(sServiceUri, {defaultOperationMode: 'Client'});
 			oModel.setSizeLimit(9999999);
-			sap.ui.getCore().setModel(oModel);
 
 			var oMeasureModel = new JSONModel();
-			sap.ui.getCore().setModel(oMeasureModel, "measure");
 
 			var i = 0, j = 0;
 			var fnCheckUpdateOrig = ODataModel.prototype.checkUpdate;
@@ -94,7 +94,7 @@
 				Measurement.start("cu" + i, "checkupdate model", ["cu"]);
 				fnCheckUpdateOrig.apply(this, arguments);
 				Measurement.end("cu" + i);
-				sap.ui.getCore().getModel("measure").setData(Measurement.getAllMeasurements());
+				oMeasureModel.setData(Measurement.getAllMeasurements());
 			};
 			var fnCheckDataState = ODataModel.prototype.checkDataState;
 			ODataModel.prototype.checkDataState = function() {
@@ -102,13 +102,34 @@
 				Measurement.start("cd" + j, "checkDataState model", ["cd"]);
 				fnCheckDataState.apply(this, arguments);
 				Measurement.end("cd" + j);
-				sap.ui.getCore().getModel("measure").setData(Measurement.getAllMeasurements());
+				oMeasureModel.setData(Measurement.getAllMeasurements());
 			};
 			var oTable = new Table({ // create Table UI
 				columns : [
-					{label: "Measure Id", template: new Text({text:"{measure>id}"})},
-					{label: "Info", template: new Text({text:"{measure>info}"})},
-					{label: "Time", template: new Text({text:"{measure>time}"})}
+					{
+						label: new sap.m.Label({
+							text: "Measure Id"
+						}),
+						template: new Text({
+							text:"{measure>id}"
+						})
+					},
+					{
+						label: new sap.m.Label({
+							text: "Info"
+						}),
+						template: new Text({
+							text:"{measure>info}"
+						})
+					},
+					{
+						label: new sap.m.Label({
+							text: "Time"
+						}),
+						template: new Text({
+							text:"{measure>time}"
+						})
+					}
 				]
 			});
 
@@ -163,6 +184,10 @@
 					]
 				})
 			});
+
+			oTable.setModel(oModel);
+			oTable.setModel(oMeasureModel, "measure");
+
 			oTable.placeAt("content");
 		});
 	</script>

package/test/sap/ui/core/demokit/sample/Messaging/ODataBackendMessagesComp/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.125.0" #MainVersion#
+  version: "1.126.0" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.core

package/test/sap/ui/core/demokit/sample/OpaStartup/iStartMyAppInAFrame/iStartMyAppInAFrame.html

@@ -9,7 +9,8 @@
 			src="../../../../../../../../resources/sap-ui-core.js"
 			data-sap-ui-async="true"
 			data-sap-ui-theme='sap_belize'
-			data-sap-ui-libs="sap.m">
+			data-sap-ui-libs="sap.m"
+			data-sap-ui-on-init="fnInit">
 		</script>
 
 		<script src="../../../../../../../../resources/sap/ui/qunit/qunit-2-css.js"></script>

package/test/sap/ui/core/demokit/sample/OpaStartup/iStartMyAppInAFrame/iStartMyAppInAFrame.js

@@ -1,23 +1,15 @@
 /* global QUnit */
-
 QUnit.config.autostart = false;
 
-sap.ui.require(
-  [
-    "sap/ui/core/Core"
-  ],
-  async function(Core) {
+globalThis.fnInit = () => {
 	"use strict";
 
-    await Core.ready();
-
 	sap.ui.require([
 		"sap/ui/test/opaQunit",
 		"sap/ui/test/Opa5",
 		"sap/ui/test/matchers/AggregationFilled",
 		"sap/ui/test/matchers/Ancestor"
 	], function (opaTest, Opa5, AggregationFilled, Ancestor) {
-
 		QUnit.module("iStartMyAppInAFrame");
 
 		var sTestNameExt = "";
@@ -112,8 +104,6 @@ sap.ui.require(
 
 			Then.iTeardownMyApp();
 		});
-
 		QUnit.start();
-
 	});
-});
+};

package/test/sap/ui/core/demokit/sample/common/Controller.js

@@ -140,8 +140,8 @@ sap.ui.define([
 				var aMessageContexts = oEvent.getSource().getCurrentContexts(),
 					oView = this.getView();
 
-				function isWorthy(aMessageContexts) {
-					return aMessageContexts.some(function (oContext) {
+				function isWorthy(aMessageContexts0) {
+					return aMessageContexts0.some(function (oContext) {
 						return oContext.getObject().technical === true;
 					});
 				}

package/test/sap/ui/core/demokit/sample/common/ValueHelp.js

@@ -273,8 +273,8 @@ sap.ui.define([
 				that = this;
 
 			if (oField) {
-				oField.getBinding = function (sName) {
-					return that.getBinding(sName);
+				oField.getBinding = function (sName0) {
+					return that.getBinding(sName0);
 				};
 				oField.refreshDataState.call(oField, sName, oDataState);
 				oField.getBinding = fnOriginalGetBinding;

package/test/sap/ui/core/demokit/sample/matcher/BindingPath/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.125.0" #MainVersion#
+  version: "1.126.0" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.core

package/test/sap/ui/core/demokit/sample/matcher/Descendant/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.125.0" #MainVersion#
+  version: "1.126.0" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.core

package/test/sap/ui/core/demokit/sample/matcher/I18NText/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.125.0" #MainVersion#
+  version: "1.126.0" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.core

package/test/sap/ui/core/demokit/sample/matcher/LabelFor/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.125.0" #MainVersion#
+  version: "1.126.0" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.core

package/test/sap/ui/core/demokit/sample/odata/v4/GridTable/SandboxModel.js

@@ -159,7 +159,7 @@ sap.ui.define([
 			+ "([^&]+)(?:&\\$top=(\\d+))?$"), // Note: just ignore $top
 		response : {
 			buildResponse : function (aMatches, oResponse) {
-				var aNodes = [],
+				var aNodes0 = [],
 					// ID%20eq%20'0'%20or%20ID%20eq%20'1'%20or%20ID%20eq%20'1.1'
 					sKeyFilterList = aMatches[1];
 
@@ -167,12 +167,12 @@ sap.ui.define([
 					var sId = sKeyFilter.split("%20eq%20")[1].slice(1, -1),
 						oNode = mNodeById[sId];
 
-					aNodes.push(oNode);
+					aNodes0.push(oNode);
 				});
 
 				iRevision += 1;
 				oResponse.message = JSON.stringify({
-					value : SandboxModel.update(aNodes)
+					value : SandboxModel.update(aNodes0)
 				});
 			}
 		}
@@ -215,13 +215,13 @@ sap.ui.define([
 	/**
 	 * Returns a copy of the given nodes, updated to the current revision.
 	 *
-	 * @param {object[]} aNodes
+	 * @param {object[]} aNodes0
 	 *  A list of (original or updated) nodes, might include <code>null</code> values
 	 * @returns {object[]}
 	 *   An updated copy
 	 */
-	SandboxModel.update = function (aNodes) {
-		return aNodes.map(function (oNode) {
+	SandboxModel.update = function (aNodes0) {
+		return aNodes0.map(function (oNode) {
 			if (oNode && (iRevision || mRevisionOfAgeById[oNode.ID])) {
 				oNode = Object.assign({}, oNode);
 				if ("Name" in oNode) {