@openui5/sap.ui.mdc 1.102.1 → 1.103.1

package/src/sap/ui/mdc/field/ConditionsType.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 *
 	 * @param {object} [oFormatOptions] Formatting options
-	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting and parsing)
+	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting, parsing and validating)
 	 * @param {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
 	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize a value
 	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help to determine the key and description // TODO: async request????
@@ -128,7 +128,28 @@ sap.ui.define([
 
 	};
 
-	ConditionsType.prototype.formatValue = function(aConditions, sInternalType) {
+	/**
+	 * Formats the given conditions to an output value of the given target type.
+	 * This values are formatted using the given data type. Depending of the operator
+	 * and the configuration (set in <code>FormatOptions</code>) a description will be determined via given value help or delegate.
+	 *
+	 * @param {sap.ui.mdc.condition.ConditionObject[]} aConditions
+	 *	The conditions to be formatted
+	 * @param {string} sTargetType
+	 *	The target type; see {@link topic:ac56d92162ed47ff858fdf1ce26c18c4 Allowed Property Types}
+	 *	In addition to the standard target types <code>sap.ui.mdc.raw</code> can be used. In this case the value is not formatted and just
+	 *	forwarded to the target. If the value is an array representing data for a <code>CompositeType</code> the index of the needed raw value can be added to the
+	 *	name (For example if a unit should be forwarded as raw value <code>sap.ui.mdc.raw:1</code> can be used).
+	 * @return {any|Promise}
+	 *	The formatted output value or a <code>Promise</code> resolving with the formatted value
+	 * @throws {sap.ui.model.FormatException}
+	 *	If formatting to the target type is not possible
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	ConditionsType.prototype.formatValue = function(aConditions, sTargetType) {
 
 		if (aConditions == undefined || aConditions == null || this._bDestroyed) { // if destroyed do nothing
 			return null;
@@ -140,23 +161,23 @@ sap.ui.define([
 
 		var vValue;
 
-		if (!sInternalType || sInternalType === "string" || sInternalType === "any") {
+		if (!sTargetType || sTargetType === "string" || sTargetType === "any") {
 			vValue = ""; // if string requested use string
-		} else if (sInternalType === "float" || sInternalType === "int") {
+		} else if (sTargetType === "float" || sTargetType === "int") {
 			vValue = 0; // if number requested use number
 		}
 
 		var iMaxConditions = _getMaxConditions.call(this);
 
 		var aSyncPromises = [];
-		var fnCreateSyncPromise = function (oCondition, sInternalType) { // as function should not be declared inside a loop
+		var fnCreateSyncPromise = function (oCondition, sTargetType) { // as function should not be declared inside a loop
 			return SyncPromise.resolve().then(function() {
-				return this._oConditionType.formatValue(oCondition, sInternalType);
+				return this._oConditionType.formatValue(oCondition, sTargetType);
 			}.bind(this));
 		};
 
 		for (var i = 0; i < aConditions.length; i++) {
-			aSyncPromises.push(fnCreateSyncPromise.call(this, aConditions[i], sInternalType));
+			aSyncPromises.push(fnCreateSyncPromise.call(this, aConditions[i], sTargetType));
 
 			if (iMaxConditions > 0 && i >= iMaxConditions - 1) {
 				break;
@@ -183,7 +204,32 @@ sap.ui.define([
 
 	}
 
-	ConditionsType.prototype.parseValue = function(sValue, sInternalType) {
+	/**
+	 * Parses an external value of the given source type to an array of conditions that holds the value in model
+	 * representation.
+	 * These values are parsed using the given data type. Depending of the operator
+	 * and the configuration (set in <code>FormatOptions</code>) a value will be determined via given value help or delegate.
+	 *
+	 * @param {any} vValue
+	 *	The value to be parsed
+	 * @param {string} sSourceType
+	 *	The type of the given value; see
+	 *	{@link topic:ac56d92162ed47ff858fdf1ce26c18c4 Allowed Property Types}
+	 *	In addition to the standard source types <code>sap.ui.mdc.raw</code> can be used. In this case the value is not parsed and just
+	 *	used in the condition. If the value of the condition is an array representing data for a <code>CompositeType</code> the index of the needed raw value can be added to the
+	 *	name (For example if a unit should be forwarded as raw value <code>sap.ui.mdc.raw:1</code> can be used).
+	 * @return {null|sap.ui.mdc.condition.ConditionObject[]|Promise<null|sap.ui.mdc.condition.ConditionObject[]>}
+	 *	The array of conditions or a <code>Promise</code> resolving with the array of conditions.
+	 *  If there is no value <code>null</code> is returned.
+	 * @throws {sap.ui.model.ParseException}
+	 *	If parsing to the model type is not possible; the message of the exception is language
+	 *	dependent as it may be displayed on the UI
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	ConditionsType.prototype.parseValue = function(vValue, sSourceType) {
 
 		if (this._bDestroyed) { // if destroyed do nothing
 			return null;
@@ -195,7 +241,7 @@ sap.ui.define([
 		}
 
 		var oCondition =  SyncPromise.resolve().then(function() {
-			return this._oConditionType.parseValue(sValue, sInternalType);
+			return this._oConditionType.parseValue(vValue, sSourceType);
 		}.bind(this)).then(function(oCondition) {
 			return _parseConditionToConditions.call(this, oCondition);
 		}.bind(this)).unwrap();
@@ -253,6 +299,21 @@ sap.ui.define([
 
 	}
 
+	/**
+	 * Validates a given array of conditions. The values of the conditions are validated using the given data type.
+	 *
+	 * @param {sap.ui.mdc.condition.ConditionObject[]} aConditions
+	 *	The conditions to be validated
+	 * @returns {void|Promise}
+	 *	<code>undefined</code> or a <code>Promise</code> resolving with an undefined value
+	 * @throws {sap.ui.model.ValidateException}
+	 *	If at least one of the values of the conditions is not valid for the given data type; the message of the exception is
+	 *	language dependent as it may be displayed on the UI
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
 	ConditionsType.prototype.validateValue = function(aConditions) {
 
 		if (aConditions === undefined || aConditions === null || this._bDestroyed) { // if destroyed do nothing

package/src/sap/ui/mdc/field/CustomFieldHelp.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -81,7 +81,6 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	CustomFieldHelp.prototype.fireSelectEvent = function(aConditions) {
 

package/src/sap/ui/mdc/field/CustomFieldInfo.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldInfoBase
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/DefineConditionPanel.js

@@ -17,7 +17,9 @@ sap.ui.define([
 	'sap/ui/mdc/enum/BaseType',
 	'sap/ui/mdc/enum/ConditionValidated',
 	'sap/ui/mdc/Field',
-	'sap/ui/mdc/field/ListFieldHelp',
+	'sap/ui/mdc/ValueHelp',
+	'sap/ui/mdc/valuehelp/Popover',
+	'sap/ui/mdc/valuehelp/content/FixedList',
 	'sap/ui/mdc/field/ListFieldHelpItem',
 	'sap/ui/model/base/ManagedObjectModel',
 	'sap/ui/model/json/JSONModel',
@@ -25,7 +27,6 @@ sap.ui.define([
 	'sap/ui/model/type/String',
 	'sap/ui/core/library',
 	'sap/ui/core/InvisibleText',
-	'sap/ui/core/ListItem',
 	'sap/ui/layout/Grid',
 	'sap/ui/layout/GridData',
 	'sap/m/library',
@@ -48,7 +49,9 @@ sap.ui.define([
 		BaseType,
 		ConditionValidated,
 		Field,
-		ListFieldHelp,
+		ValueHelp,
+		Popover,
+		FixedList,
 		ListFieldHelpItem,
 		ManagedObjectModel,
 		JSONModel,
@@ -56,7 +59,6 @@ sap.ui.define([
 		StringType,
 		coreLibrary,
 		InvisibleText,
-		ListItem,
 		Grid,
 		GridData,
 		mLibrary,
@@ -91,7 +93,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -371,90 +373,95 @@ sap.ui.define([
 
 		onSelectChange: function(oEvent) {
 			var oField = oEvent.getSource();
-			var oCondition = oField.getBindingContext("$this").getObject();
-			var aConditions = this.getConditions();
-			var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
-			if (iIndex >= 0) {
-				oCondition = aConditions[iIndex]; // to get right instance
-			}
-
-			if (!oEvent.getParameter("valid")) { // if Operator in error state -> don't update values
-				oCondition.invalid = true;
-				this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
-				oField._sOldKey = oField.getValue();
-				_checkInvalidInput.call(this, true); // set imediately, not only if row left
-				return;
-			}
-
-			var sKey = oField.getValue();
-			var sOldKey = oField._sOldKey;
-			var oOperator = FilterOperatorUtil.getOperator(sKey); // operator must exist as List is created from valid operators
-			var oOperatorOld = sOldKey && FilterOperatorUtil.getOperator(sOldKey);
+			var oPromise = oEvent.getParameter("promise"); // as with FixedList direct user input is parsed async wait for the promise
 
-			if (oOperator && oOperatorOld) {
-				var bUpdate = false;
+			oPromise.then(function (sKey) {
+				var sOldKey = oField._sOldKey;
+				var oOperator = FilterOperatorUtil.getOperator(sKey); // operator must exist as List is created from valid operators
+				var oOperatorOld = sOldKey && FilterOperatorUtil.getOperator(sOldKey);
+				var oCondition = oField.getBindingContext("$this").getObject();
+				var aConditions = this.getConditions();
+				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
+				if (iIndex >= 0) {
+					oCondition = aConditions[iIndex]; // to get right instance
+				}
 
-				if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static ) {
-					// type changed -> remove entered value (only if changed by user in Select)
-					// As Static text updated on condition change, don't delete it here.
-					if (iIndex >= 0) {
-						oCondition.values.forEach(function(value, index) {
-							if (value !== null) {
-								if ((oOperator.valueTypes[index] === Operator.ValueType.Self && oOperatorOld.valueTypes[index] === Operator.ValueType.SelfNoParse) ||
-										(oOperator.valueTypes[index] === Operator.ValueType.SelfNoParse && oOperatorOld.valueTypes[index] === Operator.ValueType.Self)) {
-									// as for Decimal values the type might change we need to format and parse again
-									var oType = _getFieldType.call(this, oOperator.name, index);
-									var oTypeOld = _getFieldType.call(this, oOperatorOld.name, index);
-									var sValue = oTypeOld.formatValue(oCondition.values[index], "string");
-									var vValue = oType.parseValue(sValue, "string");
-									if (vValue !== oCondition.values[index]) {
-										oCondition.values[index] = oType.parseValue(sValue, "string");
+				if (oOperator && oOperatorOld) {
+					var bUpdate = false;
+
+					if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static ) {
+						// type changed -> remove entered value (only if changed by user in Select)
+						// As Static text updated on condition change, don't delete it here.
+						if (iIndex >= 0) {
+							oCondition.values.forEach(function(value, index) {
+								if (value !== null) {
+									if ((oOperator.valueTypes[index] === Operator.ValueType.Self && oOperatorOld.valueTypes[index] === Operator.ValueType.SelfNoParse) ||
+											(oOperator.valueTypes[index] === Operator.ValueType.SelfNoParse && oOperatorOld.valueTypes[index] === Operator.ValueType.Self)) {
+										// as for Decimal values the type might change we need to format and parse again
+										var oType = _getFieldType.call(this, oOperator.name, index);
+										var oTypeOld = _getFieldType.call(this, oOperatorOld.name, index);
+										var sValue = oTypeOld.formatValue(oCondition.values[index], "string");
+										var vValue = oType.parseValue(sValue, "string");
+										if (vValue !== oCondition.values[index]) {
+											oCondition.values[index] = oType.parseValue(sValue, "string");
+											bUpdate = true;
+										}
+									} else {
+										oCondition.values[index] = null;
 										bUpdate = true;
 									}
-								} else {
-									oCondition.values[index] = null;
-									bUpdate = true;
 								}
+							}.bind(this));
+						}
+					}
+
+					if (iIndex >= 0 && oOperator.valueDefaults) {
+						// sets the default values for the operator back to default, if the condition is inital or the value is null
+						oCondition.values.forEach(function(value, index) {
+							if ((oCondition.isInitial && value !== oOperator.valueDefaults[index]) ||  (value === null)) {
+								// set the default value and mark the condition as initial
+								oCondition.values[index] = oOperator.valueDefaults[index];
+								oCondition.isInitial = true;
+								bUpdate = true;
 							}
-						}.bind(this));
+						});
 					}
-				}
 
-				if (iIndex >= 0 && oOperator.valueDefaults) {
-					// sets the default values for the operator back to default, if the condition is inital or the value is null
-					oCondition.values.forEach(function(value, index) {
-						if ((oCondition.isInitial && value !== oOperator.valueDefaults[index]) ||  (value === null)) {
-							// set the default value and mark the condition as initial
-							oCondition.values[index] = oOperator.valueDefaults[index];
-							oCondition.isInitial = true;
-							bUpdate = true;
+					if (!oOperator.valueTypes[1] && oOperatorOld.valueTypes[1]) {
+						// switch from BT to EQ -> remove second value even if filled
+						if (iIndex >= 0) {
+							if (oCondition.values.length > 1 && oCondition.values[1]) {
+								oCondition.values = oCondition.values.slice(0, 1);
+								bUpdate = true;
+							}
 						}
-					});
-				}
-
+					}
 
-				if (!oOperator.valueTypes[1] && oOperatorOld.valueTypes[1]) {
-					// switch from BT to EQ -> remove second value even if filled
-					if (iIndex >= 0) {
-						if (oCondition.values.length > 1 && oCondition.values[1]) {
-							oCondition.values = oCondition.values.slice(0, 1);
-							bUpdate = true;
-						}
+					if (oCondition.invalid) {
+						delete oCondition.invalid;
+						bUpdate = true;
+					}
+					if (bUpdate) {
+						FilterOperatorUtil.checkConditionsEmpty(oCondition, _getOperators.call(this));
+						this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+						_checkInvalidInput.call(this, false); // set imediately, not only if row left
 					}
 				}
 
-				if (oCondition.invalid) {
-					delete oCondition.invalid;
-					bUpdate = true;
-				}
-				if (bUpdate) {
-					FilterOperatorUtil.checkConditionsEmpty(oCondition, _getOperators.call(this));
-					this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
-					_checkInvalidInput.call(this, false); // set imediately, not only if row left
+				delete oField._sOldKey;
+			}.bind(this)).catch(function (oException) { // if Operator in error state -> don't update values
+				var oCondition = oField.getBindingContext("$this").getObject();
+				var aConditions = this.getConditions();
+				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
+				if (iIndex >= 0) {
+					oCondition = aConditions[iIndex]; // to get right instance
 				}
-			}
+				oCondition.invalid = true;
+				this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+				oField._sOldKey = oField.getValue();
+				_checkInvalidInput.call(this, true); // set imediately, not only if row left
+			}.bind(this));
 
-			delete oField._sOldKey;
 		},
 
 		onPaste: function(oEvent) {
@@ -880,16 +887,17 @@ sap.ui.define([
 
 		var bHasMultipleGroups = _hasMultipleOperatorGroups.call(this);
 
-		var sFieldHelpId = this.getId() + "--rowSelect-help";
-		var oListFieldHelp = sap.ui.getCore().byId(sFieldHelpId);
+		var sFixedListId = this.getId() + "--rowSelect-help-pop-fl";
+		var oFixedList = sap.ui.getCore().byId(sFixedListId);
 
 		var oTemplate;
 		if (bHasMultipleGroups) {
 			oTemplate = new ListFieldHelpItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}", groupKey: "{om>groupId}", groupText: "{om>groupText}"});
 		} else {
-			oTemplate = new ListItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}"});
+			oTemplate = new ListFieldHelpItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}"});
 		}
-		oListFieldHelp.bindAggregation("items", { path: 'om>/', templateShareable: false, template: oTemplate});
+		oFixedList.bindAggregation("items", { path: 'om>/', templateShareable: false, template: oTemplate});
+		oFixedList.setGroupable(bHasMultipleGroups);
 
 		for (var i = 0; i < aOperators.length; i++) {
 			var sOperator = aOperators[i];
@@ -1016,9 +1024,13 @@ sap.ui.define([
 		).addStyleClass("sapMdcDefineconditionPanel");
 
 		oPanel.addDependent(
-			new ListFieldHelp(this.getId() + "--rowSelect-help", {
-				filterList: false,
-				useFirstMatch: true
+			new ValueHelp(this.getId() + "--rowSelect-help", {
+				typeahead: new Popover(this.getId() + "--rowSelect-help-pop", {
+									content: [new FixedList(this.getId() + "--rowSelect-help-pop-fl", {
+													filterList: false,
+													useFirstMatch: true
+												})]
+								})
 			})
 		);
 

package/src/sap/ui/mdc/field/DynamicDateRangeConditionsType.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.ConditionsType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @since 1.96.0
 	 * @private
@@ -166,78 +166,25 @@ sap.ui.define([
 
 	function _dateToTimestamp(vValue) {
 
-		var oType = _getInternalType.call(this);
-		var sBaseType = _getBaseType.call(this);
-		var sDate = oType.formatValue(vValue, "string");
-		var aParts;
-		var iHour = 0;
-		var iMinute = 0;
-		var iSecond = 0;
-		var iMillisecond = 0;
-
-		if (sBaseType === BaseType.DateTime) {
-			aParts = sDate.split("T");
-			sDate = aParts[0];
-			var sTime = aParts[1];
-			aParts = sTime.split(":");
-			iHour = parseInt(aParts[0]);
-			iMinute = parseInt(aParts[1]);
-			iSecond = parseInt(aParts[2]);
-			// iMillisecond = parseInt(aParts[3]);
-		}
-
-		aParts = sDate.split("-");
-		var iYear = parseInt(aParts[0]);
-		var iMonth = parseInt(aParts[1]) - 1;
-		var iDate = parseInt(aParts[2]);
-		var iTimeStamp = new Date(iYear, iMonth, iDate, iHour, iMinute, iSecond, iMillisecond).getTime();
-
-		return iTimeStamp;
+		var oType = _getValueType.call(this);
+		var oModelFormat = oType.getModelFormat();
+		var oDate = oModelFormat.parse(vValue); // All Date and DateTime types parse the model specific value into a JS-Date via ModelFormat. UTC is used, so the JS Date is timezone independent. For Date types UTC 00:00:00 is used.
+		return oDate.getTime();
 
 	}
 
 	function _timestampToDate(iTimeStamp) {
 
-		var oType = _getInternalType.call(this);
-		var sBaseType = _getBaseType.call(this);
+		var oType = _getValueType.call(this);
+		var oModelFormat = oType.getModelFormat();
 		var oDate = new Date(iTimeStamp);
-		var iYear = oDate.getFullYear();
-		var iMonth = oDate.getMonth() + 1;
-		var iDate = oDate.getDate();
-		var sDate = iYear.toString() + "-" + ((iMonth < 10) ? "0" : "") + iMonth.toString() + "-" + ((iDate < 10) ? "0" : "") + iDate.toString();
-
-		if (sBaseType === BaseType.DateTime) {
-			var iHour = oDate.getHours();
-			var iMinute = oDate.getMinutes();
-			var iSecond = oDate.getSeconds();
-			var iMillisecond = 0/*oDate.getMilliseconds()*/;
-			sDate = sDate + "T" + ((iHour < 10) ? "0" : "") + iHour.toString() + ":" + ((iMinute < 10) ? "0" : "") + iMinute.toString() + ":" + ((iSecond < 10) ? "0" : "") + iSecond.toString() + ":" + ((iMillisecond < 100) ? "0" : "") + ((iMillisecond < 10) ? "0" : "") + iMillisecond.toString();
-		}
-		var vDate = oType.parseValue(sDate, "string");
+		oDate.setUTCMilliseconds(0); // ignore missiseconds for the moment (As not saved in variants)
+		var vDate = oModelFormat.format(oDate); // All Date and DateTime types parse the model specific value into a JS-Date via ModelFormat. UTC is used, so the JS Date is timezone independent. For Date types UTC 00:00:00 is used.
 
 		return vDate;
 
 	}
 
-	function _getInternalType() {
-
-		if (!this._oInternalType) {
-			var oType = _getValueType.call(this);
-			var sBaseType = _getBaseType.call(this);
-			var sPattern;
-
-			if (sBaseType === BaseType.DateTime) {
-				sPattern = "yyyy-MM-dd'T'HH:mm:ss:SSS";
-			} else {
-				sPattern = "yyyy-MM-dd";
-			}
-			this._oInternalType = DateUtil.createInternalType(oType, sPattern);
-		}
-
-		return this._oInternalType;
-
-	}
-
 	DynamicDateRangeConditionsType.prototype.parseValue = function(oValue, sInternalType) {
 
 		if (this._bDestroyed) { // if destroyed do nothing