@openui5/sap.ui.core 1.93.3 → 1.96.2

package/src/sap/ui/core/mvc/XMLView.js

@@ -96,7 +96,7 @@ sap.ui.define([
 	 * control's dependents aggregation or add it by using {@link sap.ui.core.mvc.XMLView#addDependent}.
 	 *
 	 * @extends sap.ui.core.mvc.View
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @alias sap.ui.core.mvc.XMLView
@@ -191,7 +191,7 @@ sap.ui.define([
 	 * @ui5-global-only
 	 */
 	sap.ui.xmlview = function(sId, vView) {
-		return sap.ui.view(sId, vView, ViewType.XML);
+		return sap.ui.view(sId, vView, ViewType.XML); // legacy-relevant
 	};
 
 	/**

package/src/sap/ui/core/mvc/XMLViewRenderer.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @private
 	 */
 	var XMLViewRenderer = {
-		apiVersion: 1 // HTML fragments still require write (fragments are explicitly not wellformed HTML)
+		apiVersion: 2
 	};
 
 
@@ -72,9 +72,8 @@ sap.ui.define([
 	 */
 	XMLViewRenderer.render = function(rm, oControl) {
 		// write the HTML into the render manager
-		var vFragment,
-		 $oldContent = oControl._$oldContent = RenderManager.findPreservedContent(oControl.getId());
-
+		var aParsedContent = oControl._aParsedContent;
+		var $oldContent = oControl._$oldContent = RenderManager.findPreservedContent(oControl.getId());
 		if ( $oldContent.length === 0) {
 			// Log.debug("rendering " + oControl + " anew");
 			var bSubView = oControl.isSubView();
@@ -91,19 +90,17 @@ sap.ui.define([
 				rm.style("height", oControl.getHeight());
 				rm.openEnd();
 			}
-			if (oControl._aParsedContent) {
-				for (var i = 0; i < oControl._aParsedContent.length; i++) {
-					vFragment = oControl._aParsedContent[i];
-					if (vFragment && typeof (vFragment) === "string") {
-						// Due to the possibility of mixing (X)HTML and UI5 controls in the XML content,
-						// the XMLViewRenderer cannot be migrated fully to API version 2 yet.
-						// Here we need to pass the raw strings to the RenderManager as it was written in the *.view.xml.
-						rm.write(vFragment);
+			if (aParsedContent) {
+				for (var i = 0; i < aParsedContent.length; i++) {
+					var vRmInfo = aParsedContent[i];
+					// apply RenderManagerAPI calls which might have been recorded during XML processing for all encountered HTML elements in an XMLView
+					if (Array.isArray(vRmInfo)) {
+						rm[vRmInfo[0]].apply(rm, vRmInfo[1]);
 					} else {
-						rm.renderControl(vFragment);
-						// when the child control did not render anything (e.g. visible=false), we add a placeholder to know where to render the child later
-						if ( !vFragment.bOutput ) {
-							rm.openStart("div", PREFIX_DUMMY + vFragment.getId());
+						rm.renderControl(vRmInfo);
+						// when the child control did not render anything, we add a placeholder to know where to render the child later
+						if ( !vRmInfo.bOutput ) {
+							rm.openStart("div", PREFIX_DUMMY + vRmInfo.getId());
 							rm.class("sapUiHidden");
 							rm.openEnd();
 							rm.close("div");
@@ -124,10 +121,10 @@ sap.ui.define([
 			rm.openStart("div", PREFIX_TEMPORARY + oControl.getId());
 			rm.class("sapUiHidden");
 			rm.openEnd();
-			for (var k = 0; k < oControl._aParsedContent.length; k++) {
-				vFragment = oControl._aParsedContent[k];
-				if ( typeof (vFragment) !== "string") {
-
+			for (var i = 0; i < aParsedContent.length; i++) {
+				var vFragment = aParsedContent[i];
+				// if the parsed content does not have a corresponding _renderManagerAPICall, it's a control
+				if (!Array.isArray(vFragment)) {
 					// render DOM string for child control
 					rm.renderControl(vFragment);
 

package/src/sap/ui/core/plugin/DeclarativeSupport.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @see sap.ui.core.DeclarativeSupport
 	 * @public
 	 * @since 1.7.0
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @alias sap.ui.core.plugin.DeclarativeSupport
 	 */
 	var DeclarativeSupportPlugin = function() {

package/src/sap/ui/core/plugin/LessSupport.js

@@ -37,7 +37,7 @@
 			 *        feature - DO NOT USE IN PRODUCTIVE SCENARIOS!!
 			 *
 			 * @author Peter Muessig
-			 * @version 1.93.3
+			 * @version 1.96.2
 			 * @private
 			 * @alias sap.ui.core.plugin.LessSupport
 			 */

package/src/sap/ui/core/plugin/TemplatingSupport.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @author Peter Muessig
 	 * @public
 	 * @since 1.15.0
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @alias sap.ui.core.plugin.TemplatingSupport
 	 */
 	var TemplatingSupport = function() {

package/src/sap/ui/core/postmessage/Bus.js

@@ -38,7 +38,7 @@ function (
 	 * @alias sap.ui.core.postmessage.Bus
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @private
 	 * @ui5-restricted sap.ui.core.support, sap.ui.support, sap.ui.rta
 	 */

package/src/sap/ui/core/postmessage/confirmationDialog.js

@@ -13,7 +13,7 @@ sap.ui.define(function () {
 	 *
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @function
 	 * @param {string} sMessage - Dialog message

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

@@ -528,13 +528,21 @@ sap.ui.define([
 	 * @private
 	 */
 	History.prototype._hashReplaced = function(oEvent) {
-		var sHash = oEvent.getParameter("hash");
+		var sHash = oEvent.getParameter("hash"),
+			sDirection = oEvent.getParameter("direction");
 
 		if (sHash === undefined) {
 			sHash = oEvent.getParameter("sHash");
 		}
 
-		this._hashChangedByApp(sHash, true, oEvent.getParameter("direction"));
+		// When the same hash is replaced, let the direction be set manually
+		// This is needed when switching between iframes. The new iframe needs to be updated with the navigation
+		// direction that is forwarded from the outer frame.
+		if (sHash === this._oHashChanger.getHash() && sDirection) {
+			this._sCurrentDirection = sDirection;
+		}
+
+		this._hashChangedByApp(sHash, true, sDirection);
 	};
 
 	/**

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

@@ -658,12 +658,19 @@ sap.ui.define([
 				}
 			},
 
+			/**
+			 * @typedef {Object} sap.ui.core.routing.RouteInfo
+			 * @property {string} name The route name
+			 * @property {Object.<string, string>} arguments The route data
+			 * @public
+			 */
+
 			/**
 			 * Returns a route info object containing the name and arguments of the route
 			 * which matches the given hash or <code>undefined</code>.
 			 *
 			 * @param {string} sHash The hash to be matched
-			 * @returns {object|undefined} An object containing the route <code>name</code> and the <code>arguments</code> or <code>undefined</code>
+			 * @returns {sap.ui.core.routing.RouteInfo|undefined} An object containing the route <code>name</code> and the <code>arguments</code> or <code>undefined</code>
 			 * @public
 			 * @since 1.75
 			 */

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

@@ -157,6 +157,19 @@ sap.ui.define([
 			 * @public
 			 */
 
+			/**
+			 * Suspends the object which is loaded by the target.
+			 *
+			 * Currently this function stops the router of the component when the object which is loaded by this target
+			 * is an instance of UIComponent. This is done only when the target is already loaded. When the target is
+			 * not loaded yet or still being loaded, the router of the component isn't stopped.
+			 *
+			 * @return {sap.ui.core.routing.Target} The 'this' to chain the call
+			 * @name sap.ui.core.routing.Target#suspend
+			 * @function
+			 * @public
+			 */
+
 			/**
 			 * Will be fired when a target is displayed
 			 *

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

@@ -727,9 +727,17 @@ sap.ui.define([
 			 */
 			_createTarget : function (sName, oTargetOptions) {
 				var oTarget,
-					oOptions;
+					oOptions,
+					oDefaults = {
+						_name: sName
+					};
+
+				if (this._vRootViewId) {
+					oDefaults.rootView = this._vRootViewId;
+				}
+
+				oOptions = deepExtend(oDefaults, this._oConfig, oTargetOptions);
 
-				oOptions = deepExtend({ _name: sName }, this._oConfig, oTargetOptions);
 				oTarget = this._constructTarget(oOptions);
 				oTarget.attachDisplay(function (oEvent) {
 					var oParameters = oEvent.getParameters();
@@ -817,6 +825,9 @@ sap.ui.define([
 						}
 					}
 				}
+
+				// save the root view id for later added target
+				this._vRootViewId = vId;
 			},
 
 			/*

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

@@ -117,7 +117,7 @@ sap.ui.define(["sap/base/Log", "sap/base/util/extend", "sap/ui/core/Component"],
 				// update the targets config so defaults are taken into account - since targets cannot be added in runtime they don't merge configs like routes do
 				oTarget._updateOptions(this._convertToTargetOptions(oConfig));
 
-				oSequencePromise = oTarget._place(oSequencePromise);
+				oSequencePromise = oTarget._place(oSequencePromise, { legacy: true });
 
 				// this is for sap.m.routing.Router to chain the promise to the navigation promise in TargetHandler
 				if (this._oRouter._oTargetHandler && this._oRouter._oTargetHandler._chainNavigation) {