@openui5/sap.ui.core 1.138.0 → 1.140.0

package/src/sap/ui/core/tmpl/DOMAttribute.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/core/Element', 'sap/ui/core/library'],
 	 * @class
 	 * Represents a DOM attribute of a DOM element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @public
 	 * @since 1.15

package/src/sap/ui/core/tmpl/DOMElement.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * Represents a DOM element. It allows to use databinding for the properties and nested DOM attributes.
 	 * @extends sap.ui.core.Control
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @public
 	 * @since 1.15

package/src/sap/ui/core/tmpl/HandlebarsTemplate.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.tmpl.Template
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.tmpl.HandlebarsTemplate
 	 * @since 1.15
 	 * @deprecated as of version 1.56. Use an {@link sap.ui.core.mvc.XMLView XMLView} or a {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed View} instead.

package/src/sap/ui/core/tmpl/Template.js

@@ -54,7 +54,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.tmpl.Template
 	 * @since 1.15
 	 * @deprecated since 1.56, use an {@link sap.ui.core.mvc.XMLView XMLView} or a {@link topic:e6bb33d076dc4f23be50c082c271b9f0 Typed View} instead.

package/src/sap/ui/core/tmpl/TemplateControl.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @class
 	 * This is the base class for all template controls. Template controls are declared based on templates.
 	 * @extends sap.ui.core.Control
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @public
 	 * @since 1.15

package/src/sap/ui/core/util/AsyncHintsHelper.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @class Utility class for asyncHints
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ushell

package/src/sap/ui/core/util/Export.js

@@ -141,7 +141,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportCell.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportColumn.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportRow.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/ManagedObject'],
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/ExportTypeCSV.js

@@ -38,7 +38,7 @@ sap.ui.define(['./ExportType'],
 	 * @extends sap.ui.core.util.ExportType
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.22.0
 	 *
 	 * @public

package/src/sap/ui/core/util/File.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/thirdparty/jquery"],
 	 * Utility class to handle files.
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @namespace
 	 *
 	 * @public

package/src/sap/ui/core/util/LibraryInfo.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @alias sap.ui.core.util.LibraryInfo
 	 */

package/src/sap/ui/core/util/MockServer.js

@@ -46,7 +46,7 @@ sap.ui
 			 * @class Class to mock http requests made to a remote server supporting the OData V2 REST protocol.
 			 * @extends sap.ui.base.ManagedObject
 			 * @author SAP SE
-			 * @version 1.138.0
+			 * @version 1.140.0
 			 * @public
 			 * @alias sap.ui.core.util.MockServer
 			 */

package/src/sap/ui/core/util/PasteHelper.js

@@ -13,7 +13,7 @@ sap.ui.define([ "sap/ui/core/Lib", "sap/ui/model/ParseException", "sap/ui/model/
 	 *
 	 * @class Parses and validates data on the <code>paste</code> event of an SAPUI5 table.
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.table.Table, sap.m.Table, sap.m.plugins.PasteProvider, sap.m.MultiInput, sap.ui.mdc.FieldBase, sap.ui.comp.smarttable.SmartTable
 	 * @alias sap.ui.core.util.PasteHelper

package/src/sap/ui/core/util/serializer/HTMLViewSerializer.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', './Serializer', './delegate/HTML', '
 	 * @class HTMLViewSerializer class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.util.serializer.HTMLViewSerializer
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/Serializer.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/assert"],
 	 * @class Serializer class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.util.serializer.Serializer
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/ViewSerializer.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/base/EventProvider', './HTMLViewSerializer', './XMLViewSe
 	 * @class ViewSerializer class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.util.serializer.ViewSerializer
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/XMLViewSerializer.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', './Serializer', './delegate/XML', 's
 	 * @class XMLViewSerializer class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.util.serializer.XMLViewSerializer
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/delegate/Delegate.js

@@ -17,7 +17,7 @@ sap.ui.define(['sap/ui/base/EventProvider'],
 	 * @class Abstract serializer delegate class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.util.serializer.delegate.Delegate
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/delegate/HTML.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Delegate', "sap/base/strings/hyphenate", "sap/base/util/deepEq
 	 * @class HTML serializer delegate class.
 	 * @extends sap.ui.core.util.serializer.delegate.Delegate
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.util.serializer.delegate.HTML
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/util/serializer/delegate/XML.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class XML serializer delegate class.
 	 * @extends sap.ui.core.util.serializer.delegate.Delegate
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.util.serializer.delegate.XML
 	 * @private
 	 * @ui5-restricted sap.watt, com.sap.webide

package/src/sap/ui/core/webc/WebComponent.js

@@ -10,8 +10,6 @@ sap.ui.define([
 	"../Element",
 	"./WebComponentMetadata",
 	"./WebComponentRenderer",
-	"sap/base/strings/hyphenate",
-	"sap/base/strings/camelize",
 	"../library",
 	"../LabelEnablement"
 ],
@@ -20,8 +18,6 @@ function(
 	Element,
 	WebComponentMetadata,
 	WebComponentRenderer,
-	hyphenate,
-	camelize,
 	coreLibrary,
 	LabelEnablement
 ) {
@@ -46,8 +42,8 @@ function(
 	/**
 	 * Returns the sap.ui.core.Element instance for an arbitrary HTML Element, or undefined, if the HTML element is not a sap.ui.core.Element
 	 *
-	 * @param obj
-	 * @returns {sap.ui.core.Element|undefined}
+	 * @param {HTMLElement|object} obj DOM Element or any object that has an id property
+	 * @returns {sap.ui.core.Element|undefined} UI5 element instance or undefined if the HTML element is not a sap.ui.core.Element
 	 * @private
 	 */
 	var fnGetControlFor = function(obj) {
@@ -59,8 +55,8 @@ function(
 	/**
 	 * Returns the active element in the shadow DOM, if any
 	 *
-	 * @param obj
-	 * @returns {HTMLElement}
+	 * @param {HTMLElement|object} obj DOM Element or any object that has an id property
+	 * @returns {HTMLElement} The active element in the shadow DOM, or the original object if no shadow DOM is present
 	 * @private
 	 */
 	var fnGetActiveElement = function(obj) {
@@ -73,10 +69,10 @@ function(
 	/**
 	 * Takes an object as an argument and returns another object, where all fields in the original object, that are HTML Elements, are deeply replaced with their sap.ui.core.Element counterparts, where applicable
 	 *
-	 * @param obj
-	 * @param level
-	 * @param maxLevel
-	 * @returns {Object}
+	 * @param {HTMLElement|object|array} obj an object that can contain HTML Elements, arrays, objects, or any other type
+	 * @param {number} level the current recursion level, used to limit the depth of the conversion
+	 * @param {number} maxLevel the maximum recursion level, defaults to 2
+	 * @returns {object} the converted object, where all HTML Elements are replaced with their sap.ui.core.Element counterparts, where applicable
 	 * @private
 	 */
 	var fnConvert = function(obj, level, maxLevel) {
@@ -136,7 +132,7 @@ function(
 	 *
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @public
 	 * @since 1.138.0
 	 * @alias sap.ui.core.webc.WebComponent
@@ -165,8 +161,8 @@ function(
 
 			this.__busyIndicatorTimeout = null;
 
-			this.__onInvalidationBound = this.__onInvalidation.bind(this);
-			this.__handleCustomEventBound = this.__handleCustomEvent.bind(this);
+			this.__onInvalidation = this.__onInvalidationBound = this.__onInvalidation.bind(this);
+			this.__handleCustomEvent = this.__handleCustomEventBound = this.__handleCustomEvent.bind(this);
 
 			this.__delegates = {
 				onBeforeRendering: this.__onBeforeRenderingDelegate,
@@ -196,6 +192,9 @@ function(
 	 * @property {Object<string, string | sap.ui.core.webc.WebComponent.MetadataOptions.Association>} [associations]
 	 *     An object literal whose properties each define a new association in the ManagedObject subclass.
 	 *     See {@link sap.ui.base.ManagedObject.MetadataOptions.Association Association} for more details.
+	 * @property {Object<string, string | sap.ui.core.webc.WebComponent.MetadataOptions.Event>} [events]
+	 *     An object literal whose properties each define a new event of the ManagedObject subclass.
+	 *     See {@link sap.ui.base.ManagedObject.MetadataOptions.Event Event} for more details.
 	 * @property {string[]} [getters]
 	 *     Proxied public getters of the Web Component which are directly accessible on the wrapper Control.
 	 * @property {string[]} [methods]
@@ -229,11 +228,10 @@ function(
 	 * @public
 	 */
 
+	// [FIX] The following mapping omits the <code>no-unnecessary-qualifier</code> error or we need to extend the <code>tslint.json</code>!
 	/**
 	 * @typedef {sap.ui.core.webc.WebComponent.MetadataOptions.Property.Mapping} sap.ui.core.webc.WebComponent.MetadataOptionsPropertyMapping
 	 *
-	 * HACK! This mapping omits the <code>no-unnecessary-qualifier</code> error or we need to extend the <code>tslint.json</code>!
-	 *
 	 * @public
 	 */
 
@@ -275,10 +273,37 @@ function(
 	 * @public
 	 */
 
+	// [FIX] The following mapping omits the <code>no-unnecessary-qualifier</code> error or we need to extend the <code>tslint.json</code>!
 	/**
 	 * @typedef {sap.ui.core.webc.WebComponent.MetadataOptions.Association.Mapping} sap.ui.core.webc.WebComponent.MetadataOptionsAssociationMapping
 	 *
-	 * HACK! This mapping omits the <code>no-unnecessary-qualifier</code> error or we need to extend the <code>tslint.json</code>!
+	 * @public
+	 */
+
+	/**
+	 * @typedef {sap.ui.base.ManagedObject.MetadataOptions.Event} sap.ui.core.webc.WebComponent.MetadataOptions.Event
+	 *
+	 * An object literal describing an event of a class derived from <code>sap.ui.core.webc.WebComponent</code>.
+	 * See {@link sap.ui.core.webc.WebComponent.MetadataOptions MetadataOptions} for details on its usage.
+	 *
+	 * @property {sap.ui.core.webc.WebComponent.MetadataOptionsEventMapping} [mapping] Defines the mapping of the event.
+	 *
+	 * @public
+	 */
+
+	/**
+	 * @typedef {object} sap.ui.core.webc.WebComponent.MetadataOptions.Event.Mapping
+	 *
+	 * An object literal describing the mapping of an event of a class derived from <code>sap.ui.core.webc.WebComponent</code>.
+	 *
+	 * @property {string} [to] Defines the target of the mapping of the event to which name it will be mapped to.
+	 *
+	 * @public
+	 */
+
+	// [FIX] The following mapping omits the <code>no-unnecessary-qualifier</code> error or we need to extend the <code>tslint.json</code>!
+	/**
+	 * @typedef {sap.ui.core.webc.WebComponent.MetadataOptions.Event.Mapping} sap.ui.core.webc.WebComponent.MetadataOptionsEventMapping
 	 *
 	 * @public
 	 */
@@ -337,8 +362,8 @@ function(
 	/**
 	 * Assigns the __slot property which tells RenderManager to render the sap.ui.core.Element (oElement) with a "slot" attribute
 	 *
-	 * @param oElement
-	 * @param sAggregationName
+	 * @param {sap.ui.core.Element} oElement a UI5 Element instance that is aggregated in the Web Component
+	 * @param {string} sAggregationName the name of the aggregation to which the element is added
 	 * @private
 	 */
 	WebComponent.prototype._setSlot = function(oElement, sAggregationName) {
@@ -537,7 +562,7 @@ function(
 		this.__updateObjectProperties(oDomRef);
 		window.customElements.whenDefined(oDomRef.localName).then(function() {
 			if (typeof oDomRef.attachInvalidate === "function") {
-				oDomRef.attachInvalidate(this.__onInvalidationBound);
+				oDomRef.attachInvalidate(this.__onInvalidation);
 			}
 
 			if (oDomRef._individualSlot) {
@@ -548,7 +573,7 @@ function(
 
 	/**
 	 * Updates all object properties (can't be done via the renderer)
-	 * @param oDomRef
+	 * @param {HTMLElement} oDomRef the DOM reference of the Web Component
 	 * @private
 	 */
 	WebComponent.prototype.__updateObjectProperties = function(oDomRef) {
@@ -568,6 +593,13 @@ function(
 		}
 	};
 
+	/**
+	 * Sets the Web Components busy state
+	 *
+	 * @param {boolean} bBusy The new busy state to be set
+	 * @returns {this} <code>this</code> to allow method chaining
+	 * @public
+	 */
 	WebComponent.prototype.setBusy = function(bBusy) {
 		var bCurrentBusyState = this.getBusy();
 
@@ -589,7 +621,7 @@ function(
 
 	/**
 	 * Synchronize user-controlled properties (such as checked, value)
-	 * @param oChangeInfo
+	 * @param {object} oChangeInfo the change information object
 	 * @private
 	 */
 	WebComponent.prototype.__onInvalidation = function(oChangeInfo) {
@@ -608,44 +640,54 @@ function(
 		}
 	};
 
+	/**
+	 * @private
+	 */
 	WebComponent.prototype.__attachCustomEventsListeners = function() {
-		var oEvents = this.getMetadata().getAllEvents();
+		var oDomRef = this.getDomRef();
+		var oEvents = this.getMetadata().getCustomEvents();
 		for (var sEventName in oEvents) {
-			var sCustomEventName = hyphenate(sEventName);
-			this.getDomRef().addEventListener(sCustomEventName, this.__handleCustomEventBound);
+			var sCustomEventName = oEvents[sEventName]._sCustomEventName;
+			oDomRef.addEventListener(sCustomEventName, this.__handleCustomEvent);
 		}
 	};
 
+	/**
+	 * @private
+	 */
 	WebComponent.prototype.__detachCustomEventsListeners = function() {
 		var oDomRef = this.getDomRef();
 		if (!oDomRef) {
 			return;
 		}
-
-		var oEvents = this.getMetadata().getAllEvents();
+		var oEvents = this.getMetadata().getCustomEvents();
 		for (var sEventName in oEvents) {
-			if (oEvents.hasOwnProperty(sEventName)) {
-				var sCustomEventName = hyphenate(sEventName);
-				oDomRef.removeEventListener(sCustomEventName, this.__handleCustomEventBound);
-			}
+			var sCustomEventName = oEvents[sEventName]._sCustomEventName;
+			oDomRef.removeEventListener(sCustomEventName, this.__handleCustomEvent);
 		}
 	};
 
+	/**
+	 * @private
+	 */
 	WebComponent.prototype.__handleCustomEvent = function(oEvent) {
-		var sCustomEventName = oEvent.type;
-		var sEventName = camelize(sCustomEventName);
-
 		// Prepare the event data object
 		var oEventData = this.__formatEventData(oEvent.detail);
 
-		// Finally fire the semantic event on the control instance
-		var oEventObj = this.getMetadata().getEvent(sEventName);
-		var bPrevented = !oEventObj.fire(this, oEventData);
-		if (bPrevented) {
-			oEvent.preventDefault();
+		// Notify all custom events that are registered for this event name
+		var mCustomEvents = this.getMetadata().getCustomEvents(oEvent.type);
+		for (var sName in mCustomEvents) {
+			var oEventObj = mCustomEvents[sName];
+			var bPrevented = !oEventObj.fire(this, oEventData);
+			if (bPrevented) {
+				oEvent.preventDefault();
+			}
 		}
 	};
 
+	/**
+	 * @private
+	 */
 	WebComponent.prototype.__formatEventData = function(vDetail) {
 		// If the event data is an object, recursively convert all object dom element properties to control references
 		if (typeof vDetail === "object") {
@@ -656,6 +698,9 @@ function(
 		return {};
 	};
 
+	/**
+	 * @private
+	 */
 	WebComponent.prototype.__callPublicMethod = function(name, args) {
 		if (!this.getDomRef()) {
 			throw new Error("Method called before custom element has been created by: " + this.getId());
@@ -676,6 +721,9 @@ function(
 		return vResult;
 	};
 
+	/**
+	 * @private
+	 */
 	WebComponent.prototype.__callPublicGetter = function(name) {
 		if (!this.getDomRef()) {
 			throw new Error("Getter called before custom element has been created by: " + this.getId());
@@ -693,7 +741,7 @@ function(
 		var oDomRef = this.getDomRef();
 		this.__detachCustomEventsListeners();
 		if (oDomRef && typeof oDomRef.detachInvalidate === "function") {
-			oDomRef.detachInvalidate(this.__onInvalidationBound);
+			oDomRef.detachInvalidate(this.__onInvalidation);
 		}
 
 		return Control.prototype.destroy.apply(this, arguments);
@@ -701,8 +749,8 @@ function(
 
 	/**
 	 * Maps the "enabled" property to the "disabled" attribute
-	 * @param bEnabled
-	 * @returns {boolean}
+	 * @param {boolean} bEnabled the enabled state of the Web Component
+	 * @returns {boolean} the mapped enabled state value
 	 * @private
 	 */
 	WebComponent.prototype._mapEnabled = function(bEnabled) {
@@ -711,8 +759,8 @@ function(
 
 	/**
 	 * Maps the "textDirection" property to the "dir" attribute
-	 * @param sTextDirection
-	 * @returns {string}
+	 * @param {sap.ui.core.TextDirection|string} sTextDirection text direction value
+	 * @returns {string} the mapped text direction value
 	 * @private
 	 */
 	WebComponent.prototype._mapTextDirection = function(sTextDirection) {

package/src/sap/ui/core/webc/WebComponentMetadata.js

@@ -8,9 +8,10 @@
 sap.ui.define([
 	"../ElementMetadata",
 	"./WebComponentRenderer",
-	"sap/base/strings/camelize"
+	"sap/base/strings/camelize",
+	"sap/base/strings/hyphenate"
 ],
-function(ElementMetadata, WebComponentRenderer, camelize) {
+function(ElementMetadata, WebComponentRenderer, camelize, hyphenate) {
 	"use strict";
 
 	var MAPPING_TYPES = ["property", "style", "textContent", "slot", "none"];
@@ -23,7 +24,7 @@ function(ElementMetadata, WebComponentRenderer, camelize) {
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.138.0
 	 * @alias sap.ui.core.webc.WebComponentMetadata
 	 * @extends sap.ui.core.ElementMetadata
@@ -89,6 +90,19 @@ function(ElementMetadata, WebComponentRenderer, camelize) {
 	WebComponentAssociation.prototype.constructor = WebComponentAssociation;
 	WebComponentMetadata.prototype.metaFactoryAssociation = WebComponentAssociation;
 
+	// Enrich event factory
+	var OriginalEvent = ElementMetadata.prototype.metaFactoryEvent;
+	var WebComponentEvent = function(oClass, name, info) {
+		OriginalEvent.apply(this, arguments);
+		if (info.mapping) {
+			this._sMapTo = info.mapping.to;
+		}
+		this._sCustomEventName = this._sMapTo ? this._sMapTo : hyphenate(name); // Create the custom event name from the mapping or the event name itself (then hyphenated)
+	};
+	WebComponentEvent.prototype = Object.create(OriginalEvent.prototype);
+	WebComponentEvent.prototype.constructor = WebComponentEvent;
+	WebComponentMetadata.prototype.metaFactoryEvent = WebComponentEvent;
+
 	WebComponentMetadata.prototype.applySettings = function(oClassInfo) {
 		var oStaticInfo = oClassInfo.metadata;
 
@@ -190,8 +204,8 @@ function(ElementMetadata, WebComponentRenderer, camelize) {
 
 	/**
 	 * Returns a map, containing all properties of a certain mapping type
-	 * @param sMapping
-	 * @returns {Object}
+	 * @param {string} sMapping mapping type
+	 * @returns {Object} map of all properties of a certain mapping type
 	 */
 	WebComponentMetadata.prototype.getPropertiesByMapping = function(sMapping) {
 		var mFiltered = {};
@@ -220,7 +234,7 @@ function(ElementMetadata, WebComponentRenderer, camelize) {
 
 	/**
 	 * Returns a map of all associations that control properties (have mapping to properties)
-	 * returns {Object}
+	 * @returns {Object} map of all associations having mappings
 	 */
 	WebComponentMetadata.prototype.getAssociationsWithMapping = function() {
 		var mFiltered = {};
@@ -237,6 +251,26 @@ function(ElementMetadata, WebComponentRenderer, camelize) {
 		return mFiltered;
 	};
 
+	/**
+	 * Returns a map of all events that are custom events (have mapping to a custom event)
+	 * @param {string} [sCustomEventName] if provided, only returns the event with this name
+	 * @returns {Object} map of custom events, where the key is the event name and the value is the event metadata object
+	 */
+	WebComponentMetadata.prototype.getCustomEvents = function(sCustomEventName) {
+		var mFiltered = {};
+		var mEvents = this.getAllEvents();
+		for (var sEventName in mEvents) {
+			var oEventObj = mEvents[sEventName];
+			if (oEventObj._sCustomEventName) {
+				if (!sCustomEventName || oEventObj._sCustomEventName === sCustomEventName) {
+					mFiltered[sEventName] = oEventObj;
+				}
+			}
+		}
+
+		return mFiltered;
+	};
+
 	/**
 	 * Retrieves the renderer for the described web component class.
 	 * Note: this is always the default renderer and Web Component wrappers should not define their own renderers.

package/src/sap/ui/core/ws/ReadyState.js

@@ -12,7 +12,7 @@ sap.ui.define(function() {
 	/**
 	 * Defines the different ready states for a WebSocket connection.
 	 *
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @enum {int}
 	 * @public
 	 * @alias sap.ui.core.ws.ReadyState

package/src/sap/ui/core/ws/SapPcpWebSocket.js

@@ -21,7 +21,7 @@ sap.ui.define(['./WebSocket', "sap/base/Log"],
 	 * @class WebSocket class implementing the pcp-protocol.
 	 * @extends sap.ui.core.ws.WebSocket
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.ws.SapPcpWebSocket
 	 */
 	var SapPcpWebSocket = WebSocket.extend("sap.ui.core.ws.SapPcpWebSocket", /** @lends sap.ui.core.ws.SapPcpWebSocket.prototype */ {

package/src/sap/ui/core/ws/WebSocket.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class Basic WebSocket class.
 	 * @extends sap.ui.base.EventProvider
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.core.ws.WebSocket
 	 */
 	var WebSocket = EventProvider.extend("sap.ui.core.ws.WebSocket", /** @lends sap.ui.core.ws.WebSocket.prototype */ {

package/src/sap/ui/debug/ControlTree.js

@@ -34,7 +34,7 @@ sap.ui.define('sap/ui/debug/ControlTree', [
 	 * @class Control Tree used for the Debug Environment
 	 * @extends sap.ui.base.EventProvider
 	 * @author Martin Schaus, Frank Weigel
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @alias sap.ui.debug.ControlTree
 	 * @private
 	 */