@openui5/sap.ui.core 1.94.0 → 1.97.0

package/src/sap/ui/core/Fragment.js

@@ -60,7 +60,7 @@ function(
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @public
 	 * @alias sap.ui.core.Fragment
 	 */
@@ -511,7 +511,7 @@ function(
 		var pFragment = fragmentFactory(mParameters);
 
 		return pFragment.then(function(oFragment) {
-			return oFragment._parsed();
+			return oFragment._pContentPromise;
 		});
 	};
 
@@ -528,24 +528,6 @@ function(
 		return mTypes[sType];
 	};
 
-	/**
-	 * Returns a promise which resolves when the content of the fragment is parsed
-	 *
-	 * @private
-	 * @returns {Promise} resolves when the content of the fragment is parsed
-	 */
-	Fragment.prototype._parsed = function() {
-		if (this._bAsync) {
-			return this._pContentPromise;
-		}
-		// sync path: make sure to reject the Fragment promise if the SyncPromise throws an error
-		try {
-			return Promise.resolve(this._pContentPromise.unwrap());
-		} catch (err) {
-			return Promise.reject(err);
-		}
-	};
-
 	/**
 	 * Instantiates an XML-based Fragment.
 	 *
@@ -601,14 +583,15 @@ function(
 
 		if (typeof (sId) === "string") { // basic call
 			if (typeof (vFragment) === "string") { // with ID
-				return sap.ui.fragment({fragmentName: vFragment, sId: sId, type: "XML"}, oController);
+				return sap.ui.fragment({fragmentName: vFragment, sId: sId, type: "XML"}, oController); // legacy-relevant
 
 			} else { // no ID, sId is actually the name and vFragment the optional Controller
-				return sap.ui.fragment(sId, "XML", vFragment);
+				return sap.ui.fragment(sId, "XML", vFragment); // legacy-relevant
 			}
 		} else { // advanced call
 			sId.type = "XML";
-			return sap.ui.fragment(sId, vFragment); // second parameter "vFragment" is the optional Controller
+			 // second parameter "vFragment" is the optional Controller
+			return sap.ui.fragment(sId, vFragment); // legacy-relevant
 		}
 	};
 
@@ -682,21 +665,21 @@ function(
 
 			} else {
 				// plain instantiation: name[+oController]
-				return sap.ui.fragment(vName, "JS", vFragmentDefinition);
+				return sap.ui.fragment(vName, "JS", vFragmentDefinition); // legacy-relevant
 			}
 
 		} else if (typeof vName === "string" && vFragmentDefinition === undefined) {
 			// plain instantiation: name only
-			return sap.ui.fragment(vName, "JS");
+			return sap.ui.fragment(vName, "JS"); // legacy-relevant
 
 		} else if (typeof vName === "object") {
 			// advanced mode: oConfig+[oController]
 			vName.type = "JS";
-			return sap.ui.fragment(vName, vFragmentDefinition);
+			return sap.ui.fragment(vName, vFragmentDefinition); // legacy-relevant
 
 		} else if (arguments.length >= 3) {
 			// must be plain instantiation mode: ID+Name[+Controller]
-			return sap.ui.fragment({id: vName, fragmentName: vFragmentDefinition, type: "JS"}, oController);
+			return sap.ui.fragment({id: vName, fragmentName: vFragmentDefinition, type: "JS"}, oController);  // legacy-relevant
 
 		} else {
 			Log.error("sap.ui.jsfragment() was called with wrong parameter set: " + vName + " + " + vFragmentDefinition);
@@ -757,14 +740,15 @@ function(
 
 		if (typeof (sId) === "string") { // basic call
 			if (typeof (vFragment) === "string") { // with ID
-				return sap.ui.fragment({fragmentName: vFragment, sId: sId, type: "HTML"}, oController);
+				return sap.ui.fragment({fragmentName: vFragment, sId: sId, type: "HTML"}, oController);  // legacy-relevant
 
 			} else { // no ID, sId is actually the name and vFragment the optional Controller
-				return sap.ui.fragment(sId, "HTML", vFragment);
+				return sap.ui.fragment(sId, "HTML", vFragment); // legacy-relevant
 			}
 		} else { // advanced call
 			sId.type = "HTML";
-			return sap.ui.fragment(sId, vFragment); // second parameter "vFragment" is the optional Controller
+			// second parameter "vFragment" is the optional Controller
+			return sap.ui.fragment(sId, vFragment); // legacy-relevant
 		}
 	};
 
@@ -825,7 +809,7 @@ function(
 			// IMPORTANT:
 			// this call can be triggered with both "async = true" and "async = false"
 			// In case of sync processing, the XMLTemplateProcessor makes sure to only use SyncPromises.
-			return XMLTemplateProcessor.parseTemplatePromise(this._xContent, this, this._bAsync, oParseConfig).then(function(aContent) {
+			var pContentPromise = XMLTemplateProcessor.parseTemplatePromise(this._xContent, this, this._bAsync, oParseConfig).then(function(aContent) {
 				this._aContent = aContent;
 				/*
 				 * If content was parsed and an objectBinding at the fragment was defined
@@ -843,6 +827,20 @@ function(
 
 				return this._aContent.length > 1 ? this._aContent : this._aContent[0];
 			}.bind(this));
+			// in sync case we must get a SyncPromise and need to unwrap for error logging
+			if (!this._bAsync) {
+				try {
+					pContentPromise.unwrap();
+				} catch (e) {
+					Log.error("An Error occured during XML processing of '" +
+							this.getMetadata().getName() +
+							"' with id '" +
+							this.getId() +
+							"':\n" +
+							e.stack);
+				}
+			}
+			return pContentPromise;
 		}
 	});
 
@@ -868,7 +866,7 @@ function(
 			} else {
 				/*** require fragment definition if not yet done... ***/
 				if (!mRegistry[mSettings.fragmentName]) {
-					sap.ui.requireSync(mSettings.fragmentName.replace(/\./g, "/") + ".fragment");
+					sap.ui.requireSync(mSettings.fragmentName.replace(/\./g, "/") + ".fragment"); // legacy-relevant: Sync path
 				}
 				/*** Step 2: merge() ***/
 				merge(this, mRegistry[mSettings.fragmentName]);

package/src/sap/ui/core/HTML.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.HTML
@@ -83,8 +83,8 @@ sap.ui.define([
 				 * @SecSink {,XSS} The content of the 'content' property is rendered 1:1 to allow the full
 				 * flexibility of HTML in UI5 applications. Applications therefore must ensure, that they don't
 				 * set malicious content (e.g. derived from user input). UI5 does not provide an HTML validation
-				 * function. jQuery.sap.encodeHTML will encode any HTML relevant character, but this is in
-				 * nearly all cases not what applications want here.
+				 * function. {@link sap/base/security/encodeXML encodeXML} will encode any HTML relevant character,
+				 * but this is in nearly all cases not what applications want here.
 				 */
 				content : {type : "string", group : "Misc", defaultValue : null},
 

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

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/base/Object', "sap/ui/util/Storage"],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @alias sap.ui.core.History
 	 * @protected
 	 */

package/src/sap/ui/core/Icon.js

@@ -9,7 +9,7 @@ sap.ui.define([
 	'sap/base/assert',
 	'../Device',
 	'./Control',
-	'./IconPool',
+	'./_IconRegistry',
 	'./InvisibleText',
 	'./library',
 	"./IconRenderer",
@@ -21,7 +21,7 @@ sap.ui.define([
 		assert,
 		Device,
 		Control,
-		IconPool,
+		_IconRegistry,
 		InvisibleText,
 		library,
 		IconRenderer,
@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @public
 	 * @since 1.11.1
@@ -395,7 +395,7 @@ sap.ui.define([
 	/* =========================================================== */
 
 	Icon.prototype.setSrc = function(sSrc) {
-		assert(sSrc == null || IconPool.isIconURI(sSrc), this + ": Property 'src' (value: '" + sSrc + "') should be a valid Icon URI (sap-icon://...)");
+		assert(sSrc == null || _IconRegistry.isIconURI(sSrc), this + ": Property 'src' (value: '" + sSrc + "') should be a valid Icon URI (sap-icon://...)");
 
 		return this.setProperty("src", sSrc);
 	};
@@ -503,10 +503,9 @@ sap.ui.define([
 		var sAlt = this.getAlt(),
 			sTooltip = this.getTooltip_AsString(),
 			bUseIconTooltip = this.getUseIconTooltip(),
-			sLabel = sAlt || sTooltip || (bUseIconTooltip && oIconInfo && (oIconInfo.text || oIconInfo.name)),
-			sOutputTitle = this._getOutputTitle(oIconInfo);
+			sLabel = sAlt || sTooltip || (bUseIconTooltip && oIconInfo && (oIconInfo.text || oIconInfo.name));
 
-		if (sLabel && sLabel !== sOutputTitle) {
+		if (sLabel) {
 			return sLabel;
 		}
 	};
@@ -567,7 +566,7 @@ sap.ui.define([
 		}
 
 		var bHasPressListeners = this.hasListeners("press");
-		var oIconInfo = IconPool.getIconInfo(this.getSrc(), undefined, "sync");
+		var oIconInfo = _IconRegistry.getIconInfo(this.getSrc(), undefined, "sync");
 
 		return {
 			role: bHasPressListeners ? "button" : "img",