@openui5/sap.ui.core 1.124.2 → 1.126.0

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/";
@@ -50,13 +52,13 @@
 					code: "MESSAGE/CODE",
 					message: "Fatal error!",
 					severity: "error",
-					target: "('0500000000')",
+					target: "('0500000000')"
 				};
 				var oMessageSO2 = {
 					code: "MESSAGE/CODE",
 					message: "Fatal error!",
 					severity: "error",
-					target: "('0500000001')",
+					target: "('0500000001')"
 				};
 				var oMessageSO1_SOI1 = {
 					code: "MESSAGE/CODE",
@@ -112,13 +114,13 @@
 					code: "MESSAGE/CODE",
 					message: "Bad price!",
 					severity: "error",
-					target: "Price",
+					target: "Price"
 				};
 				var oMessageName = {
 					code: "MESSAGE/CODE",
 					message: "Bad name!",
 					severity: "warning",
-					target: "Name",
+					target: "Name"
 				};
 
 				var oMessageProduct = Object.assign({ details: [oMessagePrice, oMessageName] }, oMessagePrice);
@@ -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>/',
@@ -329,7 +328,7 @@
 								}),
 								new Text({
 									text: "{GrossAmount}"
-								}),
+								})
 							],
 							type: "Navigation"
 						})
@@ -354,7 +353,7 @@
 							header: new Text({
 								text: "GrossAmount"
 							})
-						}),
+						})
 					],
 					itemPress: function (oEvent) {
 						var oItem = oEvent.getParameter("listItem");
@@ -389,7 +388,7 @@
 								}),
 								new Text({
 									text: "{GrossAmount}"
-								}),
+								})
 							],
 							type: "Navigation"
 						})
@@ -414,7 +413,7 @@
 							header: new Text({
 								text: "GrossAmount"
 							})
-						}),
+						})
 					],
 					itemPress: function (oEvent) {
 						var oItem = oEvent.getParameter("listItem");
@@ -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("/");
-							if(oObject){
+							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

@@ -9,42 +9,44 @@
 
 
 	<script id="sap-ui-bootstrap" type="text/javascript" src="/resources/sap-ui-core.js" data-sap-ui-theme="sap_belize"
-	    data-sap-ui-libs="sap.m, sap.ui.codeeditor, sap.ui.layout" data-sap-ui-xx-bindingSyntax="complex">
+		data-sap-ui-libs="sap.m, sap.ui.codeeditor, sap.ui.layout" data-sap-ui-xx-bindingSyntax="complex">
 	</script>
 	<script>
 
 		sap.ui.require([
-            'sap/ui/core/util/MockServer',
-            'sap/ui/model/odata/v2/ODataModel',
-            'sap/ui/model/json/JSONModel',
-            'sap/ui/model/odata/ODataPropertyBinding',
-            'sap/ui/table/Table',
-            'sap/m/Text',
-            'sap/m/Button',
-            'sap/base/util/merge',
-            'sap/ui/performance/Measurement'
-        ], function(
-            MockServer,
-            ODataModel,
-            JSONModel,
-            ODataPropertyBinding,
-            Table,
-            Text,
-            Button,
-            merge,
-            Measurement
-        ) {
-            var sServiceUri = "/SalesOrderSrv/";
-            var sDataRootPath = "qunit/testdata/SalesOrder/";
-
-            Measurement.setActive(true, ["cu", "cd"]);
-            var oMockServer = new MockServer({
-                rootUri: sServiceUri
-            });
-            oMockServer.simulate("qunit/testdata/SalesOrder/metadata.xml", sDataRootPath);
-
-            var aRequests = oMockServer.getRequests();
-            aRequests.forEach(function (oRequest) {
+			'sap/ui/core/util/MockServer',
+			'sap/ui/model/odata/v2/ODataModel',
+			'sap/ui/model/json/JSONModel',
+			'sap/ui/model/odata/ODataPropertyBinding',
+			'sap/ui/table/Table',
+			'sap/m/Button',
+			'sap/m/Label',
+			'sap/m/Text',
+			'sap/base/util/merge',
+			'sap/ui/performance/Measurement'
+		], function(
+			MockServer,
+			ODataModel,
+			JSONModel,
+			ODataPropertyBinding,
+			Table,
+			Button,
+			Label,
+			Text,
+			merge,
+			Measurement
+		) {
+			var sServiceUri = "/SalesOrderSrv/";
+			var sDataRootPath = "qunit/testdata/SalesOrder/";
+
+			Measurement.setActive(true, ["cu", "cd"]);
+			var oMockServer = new MockServer({
+				rootUri: sServiceUri
+			});
+			oMockServer.simulate("qunit/testdata/SalesOrder/metadata.xml", sDataRootPath);
+
+			var aRequests = oMockServer.getRequests();
+			aRequests.forEach(function (oRequest) {
 				var fnOrginalResponse;
 				var sPath = String(oRequest.path);
 
@@ -54,126 +56,148 @@
 					oRequest.response = function (oXhr) {
 						var fnOrignalXHRRespond = oXhr.respond;
 						var sUrl = oXhr.url;
-                        var oDo = 10000;
+						var oDo = 10000;
 						oXhr.respond = function (status, headers, content) {
 							var oMessages;
 							if (sUrl === '/SalesOrderSrv/SalesOrderSet/$count') {
-                                content = "" + oDo + 10;
-                            }
-                            else if (sUrl.startsWith('/SalesOrderSrv/SalesOrderSet')) {
-                                var oEntry, oContent = JSON.parse(content);
-
-                                for (var i = 0; i < oDo; i++) {
-                                    oEntry = merge({}, oContent.d.results[0]);
-                                    oEntry.__metadata.uri = sServiceUri + "SalesOrderSet(" + i + ")";
-                                    oEntry.SalesOrderID = "SalesOrderSet(" + i + ")"
-                                    oEntry.ToLineItems = {id:"LI("+i+")"};
-                                    oContent.d.results.push(oEntry);
-                                }
-                                content = JSON.stringify(oContent);
-                            }
+								content = "" + oDo + 10;
+							} else if (sUrl.startsWith('/SalesOrderSrv/SalesOrderSet')) {
+								var oEntry, oContent = JSON.parse(content);
+
+								for (var i = 0; i < oDo; i++) {
+									oEntry = merge({}, oContent.d.results[0]);
+									oEntry.__metadata.uri = sServiceUri + "SalesOrderSet(" + i + ")";
+									oEntry.SalesOrderID = "SalesOrderSet(" + i + ")";
+									oEntry.ToLineItems = {id:"LI(" + i + ")"};
+									oContent.d.results.push(oEntry);
+								}
+								content = JSON.stringify(oContent);
+							}
 							fnOrignalXHRRespond.apply(this, arguments);
 						};
 						fnOrginalResponse.apply(this, arguments);
 					};
 				//}
 			});
-            oMockServer.start();
-
-            // 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 = j = 0;
-            var fnCheckUpdateOrig = ODataModel.prototype.checkUpdate;
-            ODataModel.prototype.checkUpdate = function() {
-                i++;
-                Measurement.start("cu" + i, "checkupdate model", ["cu"]);
-                fnCheckUpdateOrig.apply(this, arguments);
-                Measurement.end("cu" + i);
-                sap.ui.getCore().getModel("measure").setData(Measurement.getAllMeasurements());
-            }
-            var fnCheckDataState = ODataModel.prototype.checkDataState;
-            ODataModel.prototype.checkDataState = function() {
-                j++;
-                Measurement.start("cd" + j, "checkDataState model", ["cd"]);
-                fnCheckDataState.apply(this, arguments);
-                Measurement.end("cd" + j);
-                sap.ui.getCore().getModel("measure").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}"})}
-                ]
-            });
-
-            oTable.bindRows({path: "measure>/"}); // bind the rows against a certain root-level collection in the service
-            oTable.placeAt("measure"); // place Table onto UI*/$
-
-            var oButton = new Button({text: 'force checkUpdate', press: function() {
-               oModel.checkUpdate(true);
-            }}).placeAt("measure");
-            var oButton = new Button({text: 'update data', press: function() {
-                oModel.setProperty("/SalesOrderSet(0)/id", "SalesOrderSet(0er)");
-            }}).placeAt("measure");
-            var oButton = new Button({text: 'refresh data', press: function() {
-                oTable.getBinding("items").refresh();
-            }}).placeAt("measure");
-           /* var oTable = new Table({ // create Table UI
-                columns : [
-                    {label: "SO ID", template: "SalesOrderID", sortProperty: "SalesOrderID" },
-                    {label: "SO Descr", template: "Note", sortProperty: "Note" },
-                    {label: "SO Descr Lang", template: "NoteLanguage", sortProperty: "NoteLanguage" },
-                    {label: "SO Cust ID", template: "CustomerID", sortProperty: "CustomerID" },
-                    {label: "Curr", template: "CurrencyCode", sortProperty: "CurrencyCode" },
-                    {label: "Gross Amount", template: "GrossAmount", sortProperty: "GrossAmount" },
-                    {label: "Net Amount", template: "NetAmount", sortProperty: "NetAmount" }
-                ]
-            });
-            oTable.setModel(oModel); // set model to Table
-
-            oTable.bindRows({path: "/SalesOrderSet", defaultOperationMode: 'Client'}); // bind the rows against a certain root-level collection in the service
-
-            oTable.placeAt("content"); // place Table onto UI*/$
-            // create a List control
-
-            var oTable = new sap.m.Table({
-                columns: [
-                    new sap.m.Column({
-                        header: new sap.m.Text({text:"SO ID"})
-                    }),
-                    new sap.m.Column({
-                        header: new sap.m.Text({text:"LI ID"})
-                    })
-                ]
-            });
-
-            // bind the List items to the data collection
+			oMockServer.start();
+
+			// create an ODataModel from URL
+			var oModel = new ODataModel(sServiceUri, {defaultOperationMode: 'Client'});
+			oModel.setSizeLimit(9999999);
+
+			var oMeasureModel = new JSONModel();
+
+			var i = 0, j = 0;
+			var fnCheckUpdateOrig = ODataModel.prototype.checkUpdate;
+			ODataModel.prototype.checkUpdate = function() {
+				i++;
+				Measurement.start("cu" + i, "checkupdate model", ["cu"]);
+				fnCheckUpdateOrig.apply(this, arguments);
+				Measurement.end("cu" + i);
+				oMeasureModel.setData(Measurement.getAllMeasurements());
+			};
+			var fnCheckDataState = ODataModel.prototype.checkDataState;
+			ODataModel.prototype.checkDataState = function() {
+				j++;
+				Measurement.start("cd" + j, "checkDataState model", ["cd"]);
+				fnCheckDataState.apply(this, arguments);
+				Measurement.end("cd" + j);
+				oMeasureModel.setData(Measurement.getAllMeasurements());
+			};
+			var oTable = new Table({ // create Table UI
+				columns : [
+					{
+						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}"
+						})
+					}
+				]
+			});
+
+			oTable.bindRows({path: "measure>/"}); // bind the rows against a certain root-level collection in the service
+			oTable.placeAt("measure"); // place Table onto UI*/$
+
+			new Button({text: 'force checkUpdate', press: function() {
+			   oModel.checkUpdate(true);
+			}}).placeAt("measure");
+			new Button({text: 'update data', press: function() {
+				oModel.setProperty("/SalesOrderSet(0)/id", "SalesOrderSet(0er)");
+			}}).placeAt("measure");
+			new Button({text: 'refresh data', press: function() {
+				oTable.getBinding("items").refresh();
+			}}).placeAt("measure");
+		   /* var oTable = new Table({ // create Table UI
+				columns : [
+					{label: "SO ID", template: "SalesOrderID", sortProperty: "SalesOrderID" },
+					{label: "SO Descr", template: "Note", sortProperty: "Note" },
+					{label: "SO Descr Lang", template: "NoteLanguage", sortProperty: "NoteLanguage" },
+					{label: "SO Cust ID", template: "CustomerID", sortProperty: "CustomerID" },
+					{label: "Curr", template: "CurrencyCode", sortProperty: "CurrencyCode" },
+					{label: "Gross Amount", template: "GrossAmount", sortProperty: "GrossAmount" },
+					{label: "Net Amount", template: "NetAmount", sortProperty: "NetAmount" }
+				]
+			});
+			oTable.setModel(oModel); // set model to Table
+
+			oTable.bindRows({path: "/SalesOrderSet", defaultOperationMode: 'Client'}); // bind the rows against a certain root-level collection in the service
+
+			oTable.placeAt("content"); // place Table onto UI*/$
+			// create a List control
+
+			var oTable = new sap.m.Table({
+				columns: [
+					new sap.m.Column({
+						header: new sap.m.Text({text:"SO ID"})
+					}),
+					new sap.m.Column({
+						header: new sap.m.Text({text:"LI ID"})
+					})
+				]
+			});
+
+			// bind the List items to the data collection
 			oTable.bindItems({
 				path : "/SalesOrderSet",
 				template : new sap.m.ColumnListItem({
 					cells: [
-                        new sap.m.Text({text: '{SalesOrderID}'}),
-                        new sap.m.Text({text: '{ToLineItems/id}'})
-                    ]
-                })
+						new sap.m.Text({text: '{SalesOrderID}'}),
+						new sap.m.Text({text: '{ToLineItems/id}'})
+					]
+				})
 			});
-            oTable.placeAt("content");
-        });
+
+			oTable.setModel(oModel);
+			oTable.setModel(oMeasureModel, "measure");
+
+			oTable.placeAt("content");
+		});
 	</script>
 
 
 </head>
 
 <body class="sapUiBody">
-    <div id="measure"></div>
-    <div id="content"></div>
+	<div id="measure"></div>
+	<div id="content"></div>
 </body>
 
 </html>

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

@@ -59,31 +59,35 @@
 		</style>
 
 		<script>
-		var openPopup, closePopup, greenClicked, openAnim, closeAnim;
+		sap.ui.require([
+			"sap/ui/core/Popup"
+		], function(Popup) {
+			"use strict";
 
-		sap.ui.require(["sap/ui/core/Popup"], function(Popup) {
-			openAnim = function($Ref, iDuration, fnCallback) {
+			globalThis.openAnim = function($Ref, iDuration, fnCallback) {
 			  $Ref.slideDown(iDuration, fnCallback);
 			};
 
-			closeAnim = function($Ref, iDuration, fnCallback) {
+			globalThis.closeAnim = function($Ref, iDuration, fnCallback) {
 			  $Ref.slideUp(iDuration, fnCallback);
 			};
 
 			var popup = null;
 			var modal = false;
 
-			openPopup = function (iDuration, bModal, bAutoClose, fnOpenAnim, fnCloseAnim, oOf, bNotCenter) {
+			globalThis.openPopup = function (iDuration, bModal, bAutoClose, fnOpenAnim, fnCloseAnim, oOf, bNotCenter) {
 				if (bModal) {
 					modal = true;
 					var oWithinArea = Popup.getWithinAreaDomRef();
 					if (oWithinArea !== window) {
 						oOf = oWithinArea;
 					}
+					//eslint-disable-next-line no-alert -- use alert to avoid conflict with UI5 popups
 					alert("Click the green rectangle to close the popup!");
 				}
 
 				if (popup) {
+					//eslint-disable-next-line no-alert -- use alert to avoid conflict with UI5 popups
 					alert("This test page only allows one open popup at a time");
 					return;
 				}
@@ -93,7 +97,7 @@
 				popup = new Popup(element, bModal, true, bAutoClose);
 				popup.attachClosed(popupClosed);
 				if (fnOpenAnim || fnCloseAnim) {
-					popup.setAnimations(openAnim, fnCloseAnim);
+					popup.setAnimations(fnOpenAnim, fnCloseAnim);
 				}
 
 				if (bNotCenter) {
@@ -101,24 +105,24 @@
 				} else {
 					popup.open(iDuration, "center center", "center center", oOf || window, null);
 				}
-			}
+			};
 
-			closePopup = function (iDuration) {
-			  if(popup) {
-				popup.close(iDuration);
-			  }
-			}
+			globalThis.closePopup = function (iDuration) {
+				if (popup) {
+					popup.close(iDuration);
+				}
+			};
 
 			function popupClosed() {
 				popup = null;
 				modal = false;
 			}
 
-			greenClicked = function () {
+			globalThis.greenClicked = function () {
 				if (modal) {
 					popup.close();
 				}
-			}
+			};
 
 			jQuery(function() {
 				document.getElementById("check").addEventListener("click", function(event) {

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

@@ -11,7 +11,7 @@
 
     <script>
 
-        /* Non-modal popup --> sap.m.Popover*/
+        /* Non-modal popup ==> sap.m.Popover*/
         var fnOpenPopover = function(){
             oPopoverStandalone.openBy(oOpenPopoverButton);
         };
@@ -69,7 +69,7 @@
         var oDialogInnerPopover = new sap.m.Dialog({
             title: "Inner Dialog of Popover",
             content: [new sap.m.Text({ text: "Inner Dialog of Popover Lorem ipsum" })],
-            leftButton: oCloseDialogInnerPopoverButton
+            beginButton: oCloseDialogInnerPopoverButton
         });
 
         var oPopoverStandalone = new sap.m.Popover({
@@ -125,12 +125,12 @@
         var oDialogInner = new sap.m.Dialog({
             title: "Inner Dialog Title",
             content: new sap.m.Text({ text:"Inner Dialog Lorem ipsum"}),
-            rightButton: oCloseBtnInner
+            endButton: oCloseBtnInner
         });
 
         var oDialog = new sap.m.Dialog({
             title: "Dialog Title",
-            leftButton: oCloseBtn
+            beginButton: oCloseBtn
         });
 
         var oBusyButton = new sap.m.Button({

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

@@ -502,7 +502,7 @@
 		var myController = sap.ui.controller("mycontroller", {
 			onInit: function() {
 				jQuery.sap.log.debug("in controller onInit");
-			},
+			}
 		});
 
 		jQuery.sap.require("sap.ui.model.json.JSONModel");