@openui5/sap.ui.core 1.117.1 → 1.118.0

package/src/sap/ui/core/routing/Router.js

@@ -845,7 +845,6 @@ sap.ui.define([
 			 */
 			navTo : function (sName, oParameters, oComponentTargetInfo, bReplace) {
 				var that = this,
-					bRouteSwitched = this._getLastMatchedRouteName() !== sName,
 					oRoute = this.getRoute(sName),
 					pComponentHashChange, sHash;
 
@@ -859,6 +858,13 @@ sap.ui.define([
 					return this;
 				}
 
+				var bRouteSwitched = this._getLastMatchedRouteName() !== sName && this._sRouteInProgress !== sName;
+
+				// this property is set after navTo is called and is reset once the browser fires the next "hashChange"
+				// event. This is used to detect the parallel calls of 'navTo' when oComponentTargetInfo is given
+				// because it runs asynchronously when there's target info given to the nested component
+				this._sRouteInProgress = sName;
+
 				if (typeof oComponentTargetInfo === "boolean") {
 					bReplace = oComponentTargetInfo;
 				}

package/src/sap/ui/core/routing/async/Route.js

@@ -37,6 +37,7 @@ sap.ui.define(["sap/base/Log", "sap/base/util/extend", "sap/ui/core/Component"],
 				aAlignedTargets,
 				bRepeated = (oRouter._oMatchedRoute === this);
 
+			oRouter._sRouteInProgress = null;
 			oRouter._stopWaitingTitleChangedFromChild();
 
 			if (oRouter._oMatchedRoute) {

package/src/sap/ui/core/routing/sync/Route.js

@@ -39,6 +39,7 @@ sap.ui.define(["sap/base/Log", "sap/base/util/extend"], function(Log, extend) {
 				aTargetControls,
 				aTargets;
 
+			oRouter._sRouteInProgress = null;
 			oRouter._oMatchedRoute = this;
 			oRouter._bMatchingProcessStarted = true;
 

package/src/sap/ui/core/search/OpenSearchProvider.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * A SearchProvider which uses the OpenSearch protocol (either JSON or XML).
 	 * @extends sap.ui.core.search.SearchProvider
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.search.OpenSearchProvider

package/src/sap/ui/core/search/SearchProvider.js

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log", 'sap/ui/core/library'],
 	 *
 	 * Do not create instances of this class, but use a concrete subclass instead.
 	 * @extends sap.ui.core.Element
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.search.SearchProvider

package/src/sap/ui/core/service/Service.js

@@ -69,7 +69,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/base/assert", "sap/base/Log"],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 * @alias sap.ui.core.service.Service
 	 * @abstract
 	 * @private

package/src/sap/ui/core/service/ServiceFactory.js

@@ -83,7 +83,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/ui/core/service/Service', "sap/base/as
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 * @alias sap.ui.core.service.ServiceFactory
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/service/ServiceFactoryRegistry.js

@@ -18,7 +18,7 @@ sap.ui.define(['./ServiceFactory', "sap/base/assert"],
 	 * The service factory registry.
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 * @alias sap.ui.core.service.ServiceFactoryRegistry
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/support/Plugin.js

@@ -5,19 +5,23 @@
  */
 
 // Provides class sap.ui.core.support.Plugin
-sap.ui.define(['sap/ui/base/Object', "sap/ui/thirdparty/jquery", "sap/base/util/uid"],
-	function(BaseObject, jQuery, uid) {
+sap.ui.define([
+	"sap/ui/base/Object",
+	"sap/ui/thirdparty/jquery",
+	"sap/base/util/uid",
+	"sap/m/MessageBox",
+	"sap/ui/core/Lib"
+],
+	function(BaseObject, jQuery, uid, MessageBox, Library) {
 	"use strict";
 
-
-
 	/**
 	 * Creates an instance of sap.ui.core.support.Plugin.
 	 * @class This class represents a plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 	 *
 	 * @abstract
 	 * @extends sap.ui.base.Object
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 * @private
 	 * @ui5-restricted
 	 * @alias sap.ui.core.support.Plugin
@@ -30,6 +34,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/ui/thirdparty/jquery", "sap/base/util/
 			this._bActive = false;
 			this._aEventIds = [];
 			this._bIsToolPlugin = oStub.isToolStub();
+			this._oStub = oStub;
 		}
 	});
 
@@ -243,6 +248,21 @@ sap.ui.define(['sap/ui/base/Object', "sap/ui/thirdparty/jquery", "sap/base/util/
 		return this._bActive;
 	};
 
+	Plugin.prototype.confirmReload = function (fnConfirmCb) {
+		MessageBox.confirm(this._getText("TechInfo.ReloadApp.ConfirmMessage"), {
+			title: this._getText("TechInfo.DebugSources.ConfirmTitle"),
+			onClose: function (oAction) {
+				if (oAction === MessageBox.Action.OK) {
+					fnConfirmCb();
+				}
+			}
+		});
+	};
+
+	Plugin.prototype._getText = function (sKey, aParameters) {
+		return Library.getResourceBundleFor("sap.ui.core").getText(sKey, aParameters);
+	};
+
 	return Plugin;
 
 });

package/src/sap/ui/core/support/Support.js

@@ -24,8 +24,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	/*global document, localStorage, window */
-
 	/**
 	 * Constructor for sap.ui.core.support.Support - must not be used: To get the singleton instance, use
 	 * sap.ui.core.support.Support.getStub.
@@ -33,7 +31,7 @@ sap.ui.define([
 	 * @class This class provides the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 	 *
 	 * @extends sap.ui.base.EventProvider
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 * @private
 	 * @alias sap.ui.core.support.Support
 	 */
@@ -77,6 +75,14 @@ sap.ui.define([
 						that._isOpen = true;
 						Support.initPlugins(that, false);
 					});
+					this.attachEvent(mEvents.RELOAD, function(oEvent) {
+						close(this._oRemoteWindow);
+						window.location.reload();
+					}.bind(this));
+					this.attachEvent(mEvents.RELOAD_WITH_PARAMETER, function(oEvent) {
+						close(this._oRemoteWindow);
+						this._reloadWithParameter(oEvent.getParameter("parameterName"), oEvent.getParameter("parameterValue"));
+					}.bind(this));
 					break;
 				case mTypes.TOOL:
 					this._oRemoteWindow = window.opener;
@@ -104,6 +110,8 @@ sap.ui.define([
 					});
 					this.sendEvent(mEvents.LIBS);
 					break;
+				default:
+					break;
 			}
 
 		}
@@ -119,7 +127,9 @@ sap.ui.define([
 	var mEvents = {
 		LIBS: "sapUiSupportLibs",
 		SETUP: "sapUiSupportSetup", //Event when support tool is opened
-		TEAR_DOWN: "sapUiSupportTeardown" //Event when support tool is closed
+		TEAR_DOWN: "sapUiSupportTeardown", //Event when support tool is closed
+		RELOAD: "sapUiSupportReload",
+		RELOAD_WITH_PARAMETER: "sapUiSupportReloadWithParameter"
 	};
 
 
@@ -345,6 +355,26 @@ sap.ui.define([
 		return "sap.ui.core.support.Support";
 	};
 
+	Support.prototype._reloadWithParameter = function (sParameter, vValue) {
+		// fetch current parameters from URL
+		var sSearch = window.location.search,
+			sURLParameter = sParameter + "=" + vValue;
+
+		/// replace or append the new URL parameter
+		if (sSearch && sSearch !== "?") {
+			var oRegExp = new RegExp("(?:^|\\?|&)" + sParameter + "=[^&]+");
+			if (sSearch.match(oRegExp)) {
+				sSearch = sSearch.replace(oRegExp, sURLParameter);
+			} else {
+				sSearch += "&" + sURLParameter;
+			}
+		} else {
+			sSearch = "?" + sURLParameter;
+		}
+
+		// reload the page by setting the new parameters
+		window.location.search = sSearch;
+	};
 
 	/**
 	 * @see sap.ui.base.EventProvider.prototype.fireEvent

package/src/sap/ui/core/support/ToolsAPI.js

@@ -5,19 +5,15 @@
  */
 
 sap.ui.define([
-	'sap/ui/core/library',
-	'sap/ui/Global',
-	'sap/ui/core/Core',
-	'sap/ui/core/Configuration',
-	'sap/ui/core/ElementMetadata',
+	"sap/ui/Global",
+	"sap/ui/core/Configuration",
+	"sap/ui/core/ElementMetadata",
 	"sap/base/util/LoaderExtensions",
 	"sap/base/util/UriParameters",
-	"jquery.sap.global"
+	"sap/ui/thirdparty/jquery"
 ],
 	function(
-		library,
 		Global,
-		Core,
 		Configuration,
 		ElementMetadata,
 		LoaderExtensions,
@@ -92,12 +88,10 @@ sap.ui.define([
 					applicationHREF: window.location.href,
 					documentTitle: document.title,
 					documentMode: document.documentMode || '',
-					debugMode: jQuery.sap.debug(),
-					statistics: jQuery.sap.statistics()
+					debugMode: Configuration.getDebug(),
+					statistics: Configuration.getStatisticsEnabled()
 				},
-
 				configurationBootstrap: window['sap-ui-config'] || Object.create(null),
-
 				configurationComputed: {
 					theme: Configuration.getTheme(),
 					language: Configuration.getLanguage(),
@@ -111,13 +105,9 @@ sap.ui.define([
 					originInfo: Configuration.getOriginInfo(),
 					noDuplicateIds: Configuration.getNoDuplicateIds()
 				},
-
 				libraries: _getLibraries(),
-
 				loadedLibraries: _getLoadedLibraries(),
-
 				loadedModules: LoaderExtensions.getAllRequiredModules().sort(),
-
 				URLParameters: getURLParameters()
 			};
 		}

package/src/sap/ui/core/support/controls/InteractionTree.js

@@ -854,8 +854,6 @@ sap.ui.define([
 
              simpleForm = new SimpleForm({
                 maxContainerCols: 2,
-                minWidth: 400,
-                labelMinWidth: 100,
                 editable: false,
                 layout: "ResponsiveGridLayout",
                 labelSpanM: 3,
@@ -988,8 +986,6 @@ sap.ui.define([
 
              simpleForm = new SimpleForm({
                 maxContainerCols: 2,
-                minWidth: 400,
-                labelMinWidth: 100,
                 editable: false,
                 layout: "ResponsiveGridLayout",
                 labelSpanM: 7,

package/src/sap/ui/core/support/plugins/Breakpoint.js

@@ -17,8 +17,6 @@ sap.ui.define(['sap/ui/Device', 'sap/ui/core/ElementMetadata', '../Plugin', "sap
 			constructor : function(oSupportStub) {
 				Plugin.apply(this, ["sapUiSupportBreakpoint", "", oSupportStub]);
 
-				this._oStub = oSupportStub;
-
 				this._methodType = {
 					clazz: 1, proto: 2
 				};

package/src/sap/ui/core/support/plugins/ControlTree.js

@@ -18,7 +18,6 @@ sap.ui.define([
 	'sap/ui/core/UIArea',
 	'sap/ui/core/mvc/View',
 	'sap/ui/core/mvc/XMLView',
-	'sap/ui/core/tmpl/Template',
 	'sap/ui/model/Binding',
 	'sap/ui/model/CompositeBinding',
 	'sap/base/util/each',
@@ -27,8 +26,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/dom/jquery/selectText",// jQuery Plugin "selectText"
-	"sap/ui/dom/jquery/cursorPos",// jQuery Plugin "cursorPos"
-	'sap/ui/core/mvc/Controller' // provides sap.ui.controller
+	"sap/ui/dom/jquery/cursorPos" // jQuery Plugin "cursorPos"
 ], function(
 	Core,
 	Plugin,
@@ -42,7 +40,6 @@ sap.ui.define([
 	UIArea,
 	View,
 	XMLView,
-	Template,
 	Binding,
 	CompositeBinding,
 	each,
@@ -53,14 +50,12 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	/*global alert */
-
 		/**
 		 * Creates an instance of sap.ui.core.support.plugins.ControlTree.
 		 * @class This class represents the ControlTree plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.ControlTree
 		 */
@@ -68,8 +63,6 @@ sap.ui.define([
 			constructor : function(oSupportStub) {
 				Plugin.apply(this, [ "sapUiSupportControlTree", "Control Tree", oSupportStub]);
 
-				this._oStub = oSupportStub;
-
 				if (this.runsAsToolPlugin()) {
 
 					// TOOLS SIDE!
@@ -1423,13 +1416,18 @@ sap.ui.define([
 						case "component":
 							oObj = Component.get(mAssoc.id);
 							break;
-						case "template":
-							oObj = Template.byId(mAssoc.id);
-							break;
 						default:
 							break;
 						}
 
+						/**
+						 * @deprecated As of version 1.58
+						 */
+						if (sStereotype === "template") {
+							var Template = sap.ui.requireSync("sap/ui/core/tmpl/Template");
+							oObj = Template.byId(mAssoc.id);
+						}
+
 						if (!oObj) {
 							continue;
 						}

package/src/sap/ui/core/support/plugins/Debugging.js

@@ -21,7 +21,6 @@ sap.ui.define([
 		var Debugging = Plugin.extend("sap.ui.core.support.plugins.Debugging", {
 			constructor: function(oSupportStub) {
 				Plugin.apply(this, ["sapUiSupportDebugging", "Debugging", oSupportStub]);
-				this._oStub = oSupportStub;
 				this._aEventIds = [
 					this.getId() + "ReceiveClasses",
 					this.getId() + "ReceiveClassMethods",
@@ -37,7 +36,6 @@ sap.ui.define([
 				this._mAddedClasses = {};
 				this._sSelectedClass = "";
 				this._mRebootUrls = {};
-
 			}
 		});
 
@@ -453,8 +451,7 @@ sap.ui.define([
 				"https://sdk.openui5.org/resources/sap-ui-core.js": "Public OpenUI5 server",
 				"https://sdk.openui5.org/nightly/resources/sap-ui-core.js": "Public OpenUI5 PREVIEW server",
 				"https://ui5.sap.com/resources/sap-ui-core.js": "Public SAPUI5 server",
-				"http://localhost:8080/testsuite/resources/sap-ui-core.js": "Localhost (port 8080), /testsuite ('grunt serve' URL)",
-				"http://localhost:8080/sapui5/resources/sap-ui-core.js": "Localhost (port 8080), /sapui5 (maven URL)"
+				"http://localhost:8080/resources/sap-ui-core.js": "Localhost (port 8080)"
 			};
 
 			this._testAndAddUrls(this._mRebootUrls);
@@ -527,6 +524,7 @@ sap.ui.define([
 
 		Debugging.prototype._onUseOtherUI5Version = function() {
 			var sRebootUrl = this.dom("RebootSelect").value;
+
 			if (sRebootUrl === "other") {
 				// use content of input field
 				sRebootUrl = this.dom("RebootInput").value;
@@ -541,11 +539,6 @@ sap.ui.define([
 				alert("Reboot URL cleared. App will start normally.");
 				/*eslint-enable no-alert */
 			} else {
-				// configure a reboot in the original window
-				this._oStub.sendEvent(this._techInfoId + "SetReboot", {
-					rebootUrl: sRebootUrl
-				});
-
 				// remember this URL in case it is a custom one
 				if (!this._mRebootUrls[sRebootUrl]) {
 					// need to get them from the domain of the app window
@@ -555,6 +548,14 @@ sap.ui.define([
 						callback: this.getId() + "SaveUrlIfNew"
 					});
 				}
+
+				// configure a reboot in the original window
+				this.confirmReload(function () {
+					this._oStub.sendEvent(this._techInfoId + "SetReboot", {
+						rebootUrl: sRebootUrl
+					});
+					this._oStub.sendEvent(this._oStub.getMetadata().getClass().EventType.RELOAD);
+				}.bind(this));
 			}
 		};
 

package/src/sap/ui/core/support/plugins/Interaction.js

@@ -6,7 +6,7 @@
 
 // Provides class sap.ui.core.support.plugins.Performance
 sap.ui.define([
-	'jquery.sap.global',
+	'sap/ui/core/Configuration',
 	'sap/ui/core/support/Plugin',
 	'sap/ui/core/support/controls/InteractionSlider',
 	'sap/ui/core/support/controls/InteractionTree',
@@ -19,7 +19,7 @@ sap.ui.define([
 	"sap/ui/core/date/UI5Date"
 	],
 	function(
-		jQuery,
+		Configuration,
 		Plugin,
 		InteractionSlider,
 		InteractionTree,
@@ -40,7 +40,7 @@ sap.ui.define([
 		 * With this plugIn the performance measurements are displayed
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Interaction
 		 */
@@ -48,8 +48,6 @@ sap.ui.define([
 			constructor : function(oSupportStub) {
 				Plugin.apply(this, ["sapUiSupportInteraction", "Interaction", oSupportStub]);
 
-				this._oStub = oSupportStub;
-
 				if (this.runsAsToolPlugin()) {
 
 					this._aEventIds = [this.getId() + "SetMeasurements",
@@ -162,8 +160,14 @@ sap.ui.define([
 			}.bind(this));
 			this.dom("odata").checked = this._bODATA_Stats_On;
 			this.dom("odata").addEventListener("click", function(oEvent) {
-				jQuery.sap.statistics(!jQuery.sap.statistics());
-			});
+				this._bODATA_Stats_On = !this._bODATA_Stats_On;
+				this.confirmReload(function () {
+					this._oStub.sendEvent(this._oStub.getMetadata().getClass().EventType.RELOAD_WITH_PARAMETER, {
+						parameterName: "sap-statistics",
+						parameterValue: this._bODATA_Stats_On
+					});
+				}.bind(this));
+			}.bind(this));
 
 
 			this.dom('record').dataset.state = (!this._bFesrActive) ? 'Start recording' : 'Stop recording';
@@ -186,8 +190,7 @@ sap.ui.define([
 
 		function initInApps(oSupportStub) {
 			var _bFesrActive = /sap-ui-xx-fesr=(true|x|X)/.test(window.location.search);
-			var _bODATA_Stats_On = jQuery.sap.statistics() ||
-				/sap-statistics=(true|x|X)/.test(window.location.search);
+			var _bODATA_Stats_On = Configuration.getStatisticsEnabled();
 
 			this._oStub.sendEvent(this.getId() + "SetQueryString", {"queryString": { bFesrActive: _bFesrActive,
 				bODATA_Stats_On: _bODATA_Stats_On}});
@@ -256,7 +259,6 @@ sap.ui.define([
 			this.dom('record').dataset.state = (!this._bFesrActive) ? 'Start recording' : 'Stop recording';
 		};
 
-
 		/**
 		 * Handler for sapUiSupportInteractionSetMeasurements event
 		 *
@@ -322,8 +324,6 @@ sap.ui.define([
 		 * @private
 		 */
 		Interaction.prototype.onsapUiSupportInteractionEnd = function(oEvent) {
-
-			//jQuery.sap.measure.end(this.getId() + "-perf");
 			Interaction.end(/* bForce= */true);
 		};
 
@@ -520,5 +520,4 @@ sap.ui.define([
 		};
 
 		return Interaction;
-
 	});

package/src/sap/ui/core/support/plugins/LocalStorage.js

@@ -15,15 +15,13 @@ sap.ui.define(['sap/ui/core/support/Plugin', "sap/base/Log"],
 		 * @class This class represents the LocalStorage plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.LocalStorage
 		 */
 		var LocalStorage = Plugin.extend("sap.ui.core.support.plugins.LocalStorage", {
 			constructor : function(oSupportStub) {
 				Plugin.apply(this, ["sapUiSupportLocalStorage", "", oSupportStub]);
-
-				this._oStub = oSupportStub;
 				this._aEventIds = [this.getId() + "GetItem", this.getId() + "SetItem"];
 			}
 		});

package/src/sap/ui/core/support/plugins/Performance.js

@@ -56,7 +56,7 @@ sap.ui.define([
 		 * With this plugIn the performance measurements are displayed
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Performance
 		 */
@@ -66,8 +66,6 @@ sap.ui.define([
 
 				_that = this;
 
-				this._oStub = oSupportStub;
-
 				if (this.runsAsToolPlugin()) {
 					this._aEventIds = [
 						this.getId() + "SetMeasurements",

package/src/sap/ui/core/support/plugins/Selector.js

@@ -20,7 +20,7 @@ sap.ui.define([
 		 * @class This class represents the selector plugin for the support tool functionality of UI5. This class is internal and all its functions must not be used by an application.
 		 *
 		 * @extends sap.ui.core.support.Plugin
-		 * @version 1.117.1
+		 * @version 1.118.0
 		 * @private
 		 * @alias sap.ui.core.support.plugins.Selector
 		 */