@openui5/sap.ui.core 1.97.1 → 1.100.0

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

@@ -126,7 +126,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.core.Element
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
@@ -837,6 +837,7 @@ sap.ui.define([
 	 * @param {object} [oFocusInfo={}] Options for setting the focus
 	 * @param {boolean} [oFocusInfo.preventScroll=false] @since 1.60 if it's set to true, the focused
 	 *   element won't be shifted into the viewport if it's not completely visible before the focus is set
+ 	 * @param {any} [oFocusInfo.targetInfo] Further control-specific setting of the focus target within the control @since 1.98
 	 * @public
 	 */
 	Element.prototype.focus = function (oFocusInfo) {
@@ -1418,12 +1419,9 @@ sap.ui.define([
 	 *
 	 * There's no difference between <code>bindElement</code> and {@link sap.ui.base.ManagedObject#bindObject}.
 	 *
-	 * @param {string|object} vPath the binding path or an object with more detailed binding options
-	 * @param {string} vPath.path the binding path
-	 * @param {object} [vPath.parameters] map of additional parameters for this binding
-	 * @param {string} [vPath.model] name of the model
-	 * @param {object} [vPath.events] map of event listeners for the binding events
-	 * @param {object} [mParameters] map of additional parameters for this binding (only taken into account when vPath is a string in that case it corresponds to vPath.parameters).
+	 * @param {string|sap.ui.base.ManagedObject.ObjectBindingInfo} vPath the binding path or an object with more detailed binding options
+	 * @param {object} [mParameters] map of additional parameters for this binding.
+	 * Only taken into account when <code>vPath</code> is a string. In that case it corresponds to <code>mParameters</code> of {@link sap.ui.base.ManagedObject.ObjectBindingInfo}.
 	 * The supported parameters are listed in the corresponding model-specific implementation of <code>sap.ui.model.ContextBinding</code>.
 	 *
 	 * @returns {this} reference to the instance itself

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @since 0.8.6
 	 * @alias sap.ui.core.ElementMetadata
 	 * @extends sap.ui.base.ManagedObjectMetadata

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

@@ -41,7 +41,7 @@ sap.ui.define([], function() {
 	 *
 	 * @param {boolean} [bDefault=true] Value that should be used as default value for the enhancement of the control.
 	 * @param {boolean} [bLegacy=false] Whether the introduced property should use the old name <code>Enabled</code>.
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @public
 	 * @class
 	 * @alias sap.ui.core.EnabledPropagator

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @public
 	 * @since 1.8.0
 	 * @alias sap.ui.core.EventBus

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

@@ -113,7 +113,7 @@ sap.ui.define(["sap/base/Log", "sap/base/util/ObjectPath", "sap/ui/core/mvc/View
 					// We cannot model the Fragment class as a dependency of the ExtensionPoint class,
 					// since the XML Fragments rely on the XMLTP for parsing and thus create a cyclic dependency:
 					// XMLTP -> ExtensionPoint -> Fragment -> XMLTP
-					var Fragment = sap.ui.require("sap.ui.core.Fragment");
+					var Fragment = sap.ui.require("sap/ui/core/Fragment");
 
 					oFactoryConfig.fragmentName = oExtensionConfig.fragmentName;
 					oFactoryConfig.containingView = oView;

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

@@ -201,7 +201,7 @@ sap.ui.define([
 		/**
 		 * Handles the focus/blur events.
 		 *
-		 * @param oRootRef e.g. document.body
+		 * @param {FocusEvent} oBrowserEvent Native browser focus/blur event object
 		 * @private
 		 */
 		FocusHandler.prototype.onEvent = function(oBrowserEvent){

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

@@ -60,7 +60,7 @@ function(
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.core.Fragment
 	 */

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.HTML

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

@@ -20,7 +20,7 @@ sap.ui.define(['./RenderManager'], function(RenderManager) {
 		 * Renders either the configured content or a dummy div that will be replaced after rendering
 		 *
 		 * @param {sap.ui.core.RenderManager} [oRM] The RenderManager instance
-		 * @param {sap.ui.core.Control} [oControl] The instance of the invisible control
+		 * @param {sap.ui.core.HTML} [oControl] The instance of the invisible control
 		 */
 		render : function(oRM, oControl) {
 			// render an invisible, but easily identifiable placeholder for the content

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.97.1
+	 * @version 1.100.0
 	 * @alias sap.ui.core.History
 	 * @protected
 	 */

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

@@ -65,12 +65,15 @@ sap.ui.define([
 	 * @class
 	 * Icon uses embedded font instead of pixel image. Comparing to image, Icon is easily scalable, color can be altered live and various effects can be added using css.
 	 *
-	 * A set of built in Icons is available and they can be fetched by calling sap.ui.core.IconPool.getIconURI and set this value to the src property on the Icon.
+	 * A set of built in Icons is available in the <a href="test-resources/sap/m/demokit/iconExplorer/webapp/index.html">Icon Explorer</a>.
+	 *
+	 * For further information, see {@link topic:21ea0ea94614480d9a910b2e93431291 Icon and Icon Pool}.
+	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.11.1
@@ -86,7 +89,18 @@ sap.ui.define([
 			properties : {
 
 				/**
-				 * This property should be set by the return value of calling sap.ui.core.IconPool.getIconURI with an Icon name parameter and an optional collection parameter which is required when using application extended Icons. A list of standard FontIcon is available here.
+				 * This property can be set by following options:
+				 *
+				 * <b>Option 1:</b></br>
+				 * The value has to be matched by following pattern <code>sap-icon://collection-name/icon-name</code> where
+				 * <code>collection-name</code> and <code>icon-name</code> have to be replaced by the desired values.
+				 * In case the default UI5 icons are used the <code>collection-name</code> can be omited.</br>
+				 * <i>Example:</i> <code>sap-icon://accept</code>
+				 *
+				 * <b>Option 2:</b>
+				 * The value is determined by using {@link sap.ui.core.IconPool.getIconURI} with an Icon name parameter
+				 * and an optional collection parameter which is required when using application extended Icons.</br>
+				 * <i>Example:</i> <code>IconPool.getIconURI("accept")</code>
 				 */
 				src : {type : "sap.ui.core.URI", group : "Data", defaultValue : null},
 
@@ -520,8 +534,7 @@ sap.ui.define([
 			});
 			this.setAggregation("_invisibleText", oInvisibleText, true);
 		} else {
-			// avoid triggering invalidation during rendering
-			oInvisibleText.setProperty("text", sText, true);
+			oInvisibleText.setText(sText);
 		}
 
 		return oInvisibleText;

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

@@ -22,7 +22,7 @@ sap.ui.define(['./_IconRegistry', './library', "sap/base/security/encodeCSS"], f
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
+	 * @param {sap.ui.core.Icon} oControl An object representation of the control that should be rendered.
 	 */
 	IconRenderer.render = function(oRm, oControl) {
 		// write the HTML into the render manager

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

@@ -16,7 +16,7 @@ sap.ui.define(['./library'],
 		 * Helper functionality for indication color support.
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 * @public
 		 * @namespace sap.ui.core.IndicationColorSupport
 		 * @since 1.66

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

@@ -23,7 +23,7 @@ sap.ui.define(['../base/Object', './EventBus', "sap/base/assert"],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 * @public
 		 * @since 1.11.0
 		 * @alias sap.ui.core.IntervalTrigger

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

@@ -32,7 +32,7 @@ function (coreLibrary, ManagedObject, Log) {
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @hideconstructor
 	 * @public
 	 * @since 1.78

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

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 * Provides the default renderer for the controls that have set their <code>visible</code> property to <code>false</code>.
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @alias module:sap/ui/core/InvisibleRenderer
 	 * @since 1.66.0
 	 * @protected

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.27.0

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

@@ -24,7 +24,7 @@ sap.ui.define(['./Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.Item

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

@@ -14,7 +14,14 @@ sap.ui.define(['../base/ManagedObject', "sap/base/assert"],
 
 	// The controls which should not be referenced by a "for" attribute (Specified in the HTML standard).
 	// Extend when needed.
-	var NON_LABELABLE_CONTROLS = ["sap.ui.comp.navpopover.SmartLink", "sap.m.Link", "sap.m.Label", "sap.m.Text"];
+	var NON_LABELABLE_CONTROLS = [
+		"sap.ui.comp.navpopover.SmartLink",
+		"sap.m.Link",
+		"sap.m.Label",
+		"sap.m.Text",
+		"sap.ui.webc.main.Label",
+		"sap.ui.webc.main.Link"
+	];
 
 	// Returns the control for the given id (if available) and invalidates it if desired
 	function toControl(sId, bInvalidate) {
@@ -129,7 +136,7 @@ sap.ui.define(['../base/ManagedObject', "sap/base/assert"],
 	 * @see sap.ui.core.LabelEnablement#enrich
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @protected
 	 * @alias sap.ui.core.LabelEnablement
 	 * @namespace

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

@@ -23,7 +23,7 @@ sap.ui.define(['./Element', "sap/ui/thirdparty/jquery", './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.LayoutData

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

@@ -23,7 +23,7 @@ sap.ui.define(['./Item', './library'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.ListItem

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @since 1.11.0

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

@@ -13,7 +13,7 @@ sap.ui.define(function() {
 	 * @param {sap.ui.core.RenderManager}
 	 *            oRm the RenderManager that can be used for writing to the
 	 *            render output buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.ui.core.LocalBusyIndicator}
 	 *            oControl an object representation of the control that should
 	 *            be rendered
 	 * @private
@@ -53,7 +53,7 @@ sap.ui.define(function() {
 	 * @param {sap.ui.core.RenderManager}
 	 *            oRm the RenderManager that can be used for writing to the
 	 *            render output buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.ui.core.LocalBusyIndicator}
 	 *            oControl an object representation of the control that should
 	 *            be rendered
 	 */

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

@@ -15,7 +15,7 @@ sap.ui.define(['./Control', "sap/base/Log"],
 	 *
 	 * @function
 	 * @private
-	 * @deprecated
+	 * @deprecated Since 1.15
 	 * @alias sap.ui.core.LocalBusyIndicatorSupport
 	 */
 	var LocalBusyIndicatorSupport = function() {

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

@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/base/Object', 'sap/base/assert', './CalendarType'],
 		 *
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 * @public
 		 * @alias sap.ui.core.Locale
 		 */

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

@@ -18,7 +18,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @public
 	 * @alias sap.ui.core.LocaleData
 	 */
@@ -27,7 +27,9 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		constructor: function(oLocale) {
 			this.oLocale = oLocale;
 			BaseObject.apply(this);
-			this.mData = getData(oLocale);
+			var oDataLoaded = getData(oLocale);
+			this.mData = oDataLoaded.mData;
+			this.sCLDRLocaleId = oDataLoaded.sCLDRLocaleId;
 		},
 
 		/**
@@ -285,7 +287,7 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		},
 
 		/**
-		 * Get combined datetime pattern with given date and and time style.
+		 * Get combined datetime pattern with given date and time style.
 		 *
 		 * @param {string} sDateStyle the required style for the date part
 		 * @param {string} sTimeStyle the required style for the time part
@@ -302,6 +304,41 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 			return sDateTimePattern.replace("{0}", sTimePattern).replace("{1}", sDatePattern);
 		},
 
+		/**
+		 * Get combined pattern with datetime and timezone for the given date and time style.
+		 *
+		 * @example
+		 * // locale de
+		 * oLocaleData.getCombinedDateTimeWithTimezonePattern("long", "long");
+		 * // "d. MMMM y 'um' HH:mm:ss z VV"
+		 *
+		 * // locale en_GB
+		 * oLocaleData.getCombinedDateTimeWithTimezonePattern("long", "long");
+		 * // "d MMMM y 'at' HH:mm:ss z VV"
+		 *
+		 * @param {string} sDateStyle The required style for the date part
+		 * @param {string} sTimeStyle The required style for the time part
+		 * @param {sap.ui.core.CalendarType} [sCalendarType] The type of calendar. If it's not set,
+		 *   it falls back to the calendar type either set in the configuration or calculated from
+		 *   the locale.
+		 * @returns {string} the combined pattern with datetime and timezone
+		 */
+		getCombinedDateTimeWithTimezonePattern: function(sDateStyle, sTimeStyle, sCalendarType) {
+			assert(sDateStyle == "short" || sDateStyle == "medium" || sDateStyle == "long" || sDateStyle == "full", "sStyle must be short, medium, long or full");
+			assert(sTimeStyle == "short" || sTimeStyle == "medium" || sTimeStyle == "long" || sTimeStyle == "full", "sStyle must be short, medium, long or full");
+			var aPatterns = [this.getCombinedDateTimePattern(sDateStyle, sTimeStyle, sCalendarType)];
+			var aMissingTokens = [{
+				group: "Timezone",
+				length: 2,
+				field: "zone",
+				symbol: "V"
+
+			}];
+			this._appendItems(aPatterns, aMissingTokens);
+			return aPatterns[0];
+		},
+
+
 		/**
 		 * Get custom datetime pattern for a given skeleton format.
 		 *
@@ -2047,7 +2084,13 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 			sLanguage = "sr_Latn";
 		}
 
-		var sId = sLanguage + "_" + sRegion; // the originally requested locale; this is the key under which the result (even a fallback one) will be stored in the end
+		// sId is the originally requested locale.
+		// this is the key under which the result (even a fallback one) will be stored in the end
+		var sId = sLanguage + "_" + sRegion;
+
+		// the locale of the loaded json file
+		var sCLDRLocaleId = sId;
+
 		// first try: load CLDR data for specific language / region combination
 		if ( sLanguage && sRegion ) {
 			mData = getOrLoad(sId);
@@ -2055,11 +2098,22 @@ sap.ui.define(['sap/base/util/extend', 'sap/ui/base/Object', './CalendarType', '
 		// second try: load data for language only
 		if ( !mData && sLanguage ) {
 			mData = getOrLoad(sLanguage);
+			sCLDRLocaleId = sLanguage;
 		}
 		// last try: load data for default language "en" (english)
-		mLocaleDatas[sId] = mData || getOrLoad("en");
+		if (!mData) {
+			mData = getOrLoad("en");
+			sCLDRLocaleId = "en";
+		}
+
+		// store in cache
+		mLocaleDatas[sId] = mData;
 
-		return mLocaleDatas[sId];
+		sCLDRLocaleId = sCLDRLocaleId.replace(/_/g, "-");
+		return {
+			mData: mData,
+			sCLDRLocaleId: sCLDRLocaleId
+		};
 	}
 
 

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

@@ -137,7 +137,7 @@ sap.ui.define([
 	 * @class The Manifest class.
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @alias sap.ui.core.Manifest
 	 * @since 1.33.0
 	 */

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

@@ -26,7 +26,7 @@ sap.ui.define(['./Element', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.ui.core.Message

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

@@ -304,7 +304,7 @@ sap.ui.define([
 	 * This is only valid when called between <code>openStart/voidStart</code> and <code>openEnd/voidEnd</code>.
 	 * Case-insensitive attribute names must all be set in lowercase.
 	 *
-	 * @param {string} vAttr Name of the attribute
+	 * @param {string} sAttr Name of the attribute
 	 * @param {*} vValue Value of the attribute; any non-string value specified is converted automatically into a string
 	 * @return {this} Reference to <code>this</code> in order to allow method chaining
 	 */
@@ -361,8 +361,8 @@ sap.ui.define([
 	 *
 	 * This is only valid when called between <code>openStart/voidStart</code> and <code>openEnd/voidEnd</code>.
 	 *
-	 * @param {string} sStyle Name of the style property
-	 * @param {string} sValue Value of the style property
+	 * @param {string} sName Name of the style property
+	 * @param {string} vValue Value of the style property
 	 * @return {this} Reference to <code>this</code> in order to allow method chaining
 	 */
 	Patcher.prototype.style = function(sName, vValue) {

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

@@ -20,33 +20,33 @@ sap.ui.define([
 	var aProviders = [];
 
 	/**
-	 * Creates and initializes a new Placeholder.
+	 * Creates a Placeholder instance. A path to a '.html' file containing the placeholder HTML content
+	 * must be provided.
+	 *
+	 * Note: As normal '.html' files are not bundled automatically, it is recommended to use an HTMLFragment
+	 * definition ('.fragment.html') instead.
+	 *
+	 * @example
+	 * new Placeholder({
+	 * 	html: 'myPlaceholder.fragment.html'
+	 * });
+	 *
+	 * @param {object} mParameters Object containing the settings for the placeholder
+	 * @param {string} mParameters.html Name of the HTML file that provides the placeholder content
+	 *
+	 * @class Represents a placeholder and its HTML content.
+	 * @alias sap.ui.core.Placeholder
+	 * @extends sap.ui.base.Object
+	 * @private
+	 * @ui5-restricted SAPUI5 Distribution libraries only
+	 * @since 1.92
 	 */
-	var Placeholder = BaseObject.extend("sap.ui.core.Placeholder", /* @lends sap.ui.core.PlaceHolder */ {
-		/**
-		 * Creates a Placeholder instance. A path to a '.html' file containing the placeholder HTML content
-		 * must be provided.
-		 *
-		 * Note: As normal '.html' files are not bundled automatically it is recomended to use a HTMLFragment
-		 * definition '.fragment.html' instead.
-		 *
-		 * @example
-		 * new Placeholder({
-		 * 	html: 'myPlaceholder.fragment.html'
-		 * });
-		 *
-		 * @param {object} mParameters Object containing the placeholder HTML file name
-		 * @param {string} [mParameters.html] Name of the HTML file that provides the placeholder content
-		 *
-		 * @private
-		 * @ui5-restricted SAPUI5 Distribution libraries only
-		 * @since 1.92
-		 */
+	var Placeholder = BaseObject.extend("sap.ui.core.Placeholder", /* @lends sap.ui.core.Placeholder.prototype */ {
 		constructor : function(mParameters) {
 			BaseObject.call(this);
 
 			if (!mParameters.html) {
-				throw new Error("A HTML page defining the placeholders content must be given!");
+				throw new Error("An HTML page defining the placeholder's content must be given!");
 			}
 			this.bShow = false;
 			this.placeholderHTML = mParameters.html;
@@ -73,7 +73,7 @@ sap.ui.define([
 				// the DOM element of the control contains the placeholder. Only when the control doesn't have the
 				// placeholder, a new placeholder DOM element is generated and inserted into the control.
 				if (sPlaceholderContent && this.bShow && !oControl.getDomRef().contains(this.placeholder)) {
-					// unblock old blockstate when multiple rendering happens
+					// unblock old blockstate when multiple renderings happen
 					if (this.blockState) {
 						BlockLayerUtils.unblock(this.blockState);
 					}
@@ -111,7 +111,7 @@ sap.ui.define([
 		/**
 		 * Loads the placeholder from given HTML file name.
 		 *
-		 * @return {Promise} Returns a promise resolving with the placeholder content
+		 * @returns {Promise<string>} Returns a promise resolving with the placeholder content
 		 * @private
 		 */
 		_load: function() {
@@ -138,7 +138,7 @@ sap.ui.define([
 	 * Registers provider functions which allow to dynamically define the placeholder HTML files,
 	 * based on the routing configuration.
 	 *
-	 * @param  {function} fnProvider Provider function which provides the placeholder HTML file name
+	 * @param {function} fnProvider Provider function which provides the placeholder HTML file name
 	 *
 	 * @private
 	 * @ui5-restricted SAPUI5 Distribution libraries only
@@ -151,7 +151,7 @@ sap.ui.define([
 	/**
 	 * Checks if provider functions have been registered.
 	 *
-	 * @return {boolean} Whether provider functions have been registered or not.
+	 * @returns {boolean} Whether provider functions have been registered or not.
 	 * @private
 	 */
 	Placeholder.hasProviders = function() {
@@ -159,10 +159,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Retrieves the placeholder HTML file for the given provider configuration
+	 * Retrieves the placeholder HTML file for the given provider configuration.
 	 *
 	 * The registered provider function must return an object providing
-	 * a html property that points to the placeholders HTML content.
+	 * an html property that points to the placeholder's HTML content.
 	 *
 	 * @param  {object} oConfig Configuration object containing the provider name
 	 * @return {object|undefined} If available, the config defined by the provider function will be returned