@openui5/sap.m 1.106.0 → 1.107.0

package/src/sap/m/MultiInput.js

@@ -107,13 +107,12 @@ function(
 	* @implements sap.ui.core.ISemanticFormContent
 	*
 	* @author SAP SE
-	* @version 1.106.0
+	* @version 1.107.0
 	*
 	* @constructor
 	* @public
 	* @alias sap.m.MultiInput
 	* @see {@link fiori:https://experience.sap.com/fiori-design-web/multiinput/ Multi-Input Field}
-	* @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	*/
 	var MultiInput = Input.extend("sap.m.MultiInput", /** @lends sap.m.MultiInput.prototype */ {
 		metadata: {
@@ -232,7 +231,9 @@ function(
 				}
 			},
 			dnd: { draggable: false, droppable: true }
-		}
+		},
+
+		renderer: MultiInputRenderer
 	});
 
 	EnabledPropagator.apply(MultiInput.prototype, [true]);

package/src/sap/m/NavContainer.js

@@ -43,12 +43,11 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @alias sap.m.NavContainer
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var NavContainer = Control.extend("sap.m.NavContainer", /** @lends sap.m.NavContainer.prototype */ {
 		metadata: {
@@ -245,7 +244,9 @@ sap.ui.define([
 					}
 				}
 			}
-		}
+		},
+
+		renderer: NavContainerRenderer
 	});
 
 	// Delegate registered by the NavContainer#showPlaceholder function
@@ -258,7 +259,7 @@ sap.ui.define([
 	};
 
 	var fnGetDelay = function (iDelay) {
-		var sAnimationMode = sap.ui.getCore().getConfiguration().getAnimationMode(),
+		var sAnimationMode = Configuration.getAnimationMode(),
 			bUseAnimations = sAnimationMode !== Configuration.AnimationMode.none && sAnimationMode !== Configuration.AnimationMode.minimal;
 
 		return bUseAnimations ? iDelay : 0;
@@ -408,7 +409,6 @@ sap.ui.define([
 	 *
 	 * @param {string} pageId The ID of the aggregated control to find
 	 * @public
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {sap.ui.core.Control|null} The control with the given ID or <code>null</code> if it doesn't exist
 	 */
 	NavContainer.prototype.getPage = function (pageId) {
@@ -440,7 +440,6 @@ sap.ui.define([
 	 * <code>sap.ui.core.mvc.View</code>, <code>sap.m.Carousel</code> or whatever is aggregated.
 	 *
 	 * @public
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {sap.ui.core.Control} The current page
 	 */
 	NavContainer.prototype.getCurrentPage = function () {
@@ -463,7 +462,6 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @since 1.7.1
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {sap.ui.core.Control} The previous page
 	 */
 	NavContainer.prototype.getPreviousPage = function () {
@@ -488,7 +486,6 @@ sap.ui.define([
 	 * but logically one is not at the top level, so this method returns "false" in this case.
 	 *
 	 * @public
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {boolean} Whether the current page is a top page
 	 */
 	NavContainer.prototype.currentPageIsTopPage = function () {
@@ -510,7 +507,6 @@ sap.ui.define([
 	 * @param {object} data This optional object can carry any payload data which would have been given to the inserted previous page if the user would have done a normal forward navigation to it.
 	 * @public
 	 * @since 1.16.1
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {this} The <code>sap.m.NavContainer</code> instance
 	 */
 	NavContainer.prototype.insertPreviousPage = function (pageId, transitionName, data) {
@@ -695,7 +691,6 @@ sap.ui.define([
 	 *         NOTE: it depends on the transition function how the object should be structured and which parameters are actually used to influence the transition.
 	 *         The "show", "slide", "baseSlide" and "fade" transitions do not use any parameter.
 	 * @public
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {this} The <code>sap.m.NavContainer</code> instance
 	 */
 	NavContainer.prototype.to = function (vPageIdOrControl, sTransitionName, oData, oTransitionParameters, bFromQueue) {
@@ -880,7 +875,6 @@ sap.ui.define([
 	 *
 	 *         NOTE: it depends on the transition function how the object should be structured and which parameters are actually used to influence the transition.
 	 * @public
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {this} The <code>sap.m.NavContainer</code> instance
 	 */
 	NavContainer.prototype.back = function (backData, oTransitionParameters) {
@@ -910,7 +904,6 @@ sap.ui.define([
 	 *         NOTE: it depends on the transition function how the object should be structured and which parameters are actually used to influence the transition.
 	 * @public
 	 * @since 1.7.2
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {this} The <code>sap.m.NavContainer</code> instance
 	 */
 	NavContainer.prototype.backToPage = function (pageId, backData, oTransitionParameters) {
@@ -939,7 +932,6 @@ sap.ui.define([
 	 * @type this
 	 * @public
 	 * @since 1.7.1
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	NavContainer.prototype.backToTop = function (backData, oTransitionParameters) {
 		this._backTo("backToTop", backData, oTransitionParameters);
@@ -1641,7 +1633,6 @@ sap.ui.define([
 	 *
 	 *         See the documentation of NavContainer.addCustomTransitions for more details about this function.
 	 * @public
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 * @returns {this} The <code>sap.m.NavContainer</code> instance
 	 */
 	NavContainer.prototype.addCustomTransition = function (sName, fTo, fBack) {
@@ -1830,7 +1821,7 @@ sap.ui.define([
 	NavContainer.prototype.showPlaceholder = function(mSettings) {
 		var pLoaded;
 
-		if (!sap.ui.getCore().getConfiguration().getPlaceholder()) {
+		if (!Configuration.getPlaceholder()) {
 			return;
 		}
 

package/src/sap/m/NewsContent.js

@@ -25,12 +25,11 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.0
 	 * @since 1.34
 	 *
 	 * @public
 	 * @alias sap.m.NewsContent
-	 * @ui5-metamodel This control will also be described in the UI5 (legacy) designtime metamodel
 	 */
 	var NewsContent = Control.extend("sap.m.NewsContent", /** @lends sap.m.NewsContent.prototype */ {
 		metadata : {
@@ -68,7 +67,9 @@ sap.ui.define([
 				 */
 				"press" : {}
 			}
-		}
+		},
+
+		renderer: NewsContentRenderer
 	});
 
 	/* --- Lifecycle methods --- */

package/src/sap/m/NotificationList.js

@@ -27,18 +27,19 @@ function(
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @since 1.90
 	 * @alias sap.m.NotificationList
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var NotificationList = ListBase.extend('sap.m.NotificationList', /** @lends sap.m.NotificationList.prototype */ {
 		metadata: {
 			library: 'sap.m'
-		}
+		},
+
+		renderer: NotificationListRenderer
 	});
 
 	NotificationList.prototype.onItemFocusIn = function() { };

package/src/sap/m/NotificationListBase.js

@@ -86,14 +86,13 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.106.0
+		 * @version 1.107.0
 		 *
 		 * @constructor
 		 * @public
 		 * @abstract
 		 * @since 1.38
 		 * @alias sap.m.NotificationListBase
-		 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 		 */
 		var NotificationListBase = ListItemBase.extend('sap.m.NotificationListBase', /** @lends sap.m.NotificationListBase.prototype */ {
 			metadata: {
@@ -349,10 +348,10 @@ sap.ui.define([
 						this.close();
 					}.bind(this)
 				});
-
-				this.setAggregation("_closeButton", closeButton);
 			}
 
+			this.setAggregation("_closeButton", closeButton);
+
 			return closeButton;
 		};
 
@@ -462,6 +461,7 @@ sap.ui.define([
 
 		NotificationListBase.prototype._arrangeButtons = function () {
 			this._destroyCloseBtnAndSeparator();
+			this._createCloseButton();
 
 			if (this._isSmallSize()) {
 				this._arrangeSSizeButtons();
@@ -475,8 +475,6 @@ sap.ui.define([
 				buttons = this.getButtons(),
 				buttonOverflowPriorityType = buttons.length > 1 ? OverflowToolbarPriority.AlwaysOverflow : OverflowToolbarPriority.NeverOverflow;
 
-			this._createCloseButton();
-
 			for (var i = 0; i < buttons.length; i++) {
 				button = buttons[i];
 
@@ -488,7 +486,7 @@ sap.ui.define([
 
 		NotificationListBase.prototype._arrangeSSizeButtons = function () {
 			var overflowToolbar = this._getOverflowToolbar(),
-				closeButton = this._createCloseButton(),
+				closeButton = this._getCloseButton(),
 				isNotificationListGroup = this.isA("sap.m.NotificationListGroup"),
 				buttonText = isNotificationListGroup ? closeAllText : closeText,
 				isCollapsed = isNotificationListGroup && this.getCollapsed(),

package/src/sap/m/NotificationListGroup.js

@@ -62,13 +62,12 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @since 1.34
 	 * @alias sap.m.NotificationListGroup
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var NotificationListGroup = NotificationListBase.extend('sap.m.NotificationListGroup', /** @lends sap.m.NotificationListGroup.prototype */ {
 		metadata: {
@@ -152,7 +151,9 @@ function(
 					}
 				}
 			}
-		}
+		},
+
+		renderer: NotificationListGroupRenderer
 	});
 
 	NotificationListGroup.prototype._getCollapseButton = function() {

package/src/sap/m/NotificationListItem.js

@@ -64,13 +64,12 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @since 1.34
 	 * @alias sap.m.NotificationListItem
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var NotificationListItem = NotificationListBase.extend('sap.m.NotificationListItem', /** @lends sap.m.NotificationListItem.prototype */ {
 		metadata: {
@@ -116,7 +115,9 @@ function(
 				 */
 				_showMoreButton: {type: 'sap.m.Link', multiple: false, visibility: "hidden"}
 			}
-		}
+		},
+
+		renderer: NotificationListItemRenderer
 	});
 
 	/**
@@ -146,15 +147,6 @@ function(
 		}
 	};
 
-	/**
-	 * Handles the internal event onBeforeRendering.
-	 *
-	 * @private
-	 */
-	NotificationListItem.prototype.onBeforeRendering = function() {
-		NotificationListBase.prototype.onBeforeRendering.call(this);
-	};
-
 	NotificationListItem.prototype.onAfterRendering = function() {
 		NotificationListBase.prototype.onAfterRendering.call(this);
 

package/src/sap/m/NumericContent.js

@@ -12,8 +12,9 @@ sap.ui.define([
 	"sap/m/Image",
 	"./NumericContentRenderer",
 	"sap/ui/events/KeyCodes",
-	"sap/base/util/deepEqual"
-], function (library, Control, IconPool, ResizeHandler, Image, NumericContentRenderer, KeyCodes, deepEqual) {
+	"sap/base/util/deepEqual",
+	"sap/ui/core/Configuration"
+], function (library, Control, IconPool, ResizeHandler, Image, NumericContentRenderer, KeyCodes, deepEqual, Configuration) {
 	"use strict";
 
 	var LANG_MAP = { // keys are compared in lowercase
@@ -107,12 +108,11 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.0
 	 * @since 1.34
 	 *
 	 * @public
 	 * @alias sap.m.NumericContent
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var NumericContent = Control.extend("sap.m.NumericContent", /** @lends sap.m.NumericContent.prototype */ {
 		metadata: {
@@ -210,7 +210,9 @@ sap.ui.define([
 				 */
 				"press": {}
 			}
-		}
+		},
+
+		renderer: NumericContentRenderer
 	});
 
 	/* --- Lifecycle methods --- */
@@ -236,7 +238,7 @@ sap.ui.define([
 
 	NumericContent.prototype._getMaxDigitsData = function () {
 		var sFontClass = null,
-			sLang = sap.ui.getCore().getConfiguration().getLanguage().toLowerCase(),
+			sLang = Configuration.getLanguage().toLowerCase(),
 			iMaxLength = LANG_MAP[sLang] || 4;
 
 		if (this.getAdaptiveFontSize()) {

package/src/sap/m/NumericInput.js

@@ -38,7 +38,7 @@ function(
 	 * @extends sap.m.Input
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/NumericInputRenderer.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["sap/ui/core/Renderer", "./InputRenderer", "sap/ui/Device", "sap/ui/core/LabelEnablement"],
-	function(Renderer, InputRenderer, Device, LabelEnablement) {
+sap.ui.define(["sap/ui/core/Renderer", "./InputRenderer", "sap/ui/Device", "sap/ui/core/LabelEnablement", "sap/ui/core/Configuration"],
+	function(Renderer, InputRenderer, Device, LabelEnablement, Configuration) {
 	"use strict";
 
 	/**
@@ -29,7 +29,7 @@ sap.ui.define(["sap/ui/core/Renderer", "./InputRenderer", "sap/ui/Device", "sap/
 		// so we have to overwrite it by leaving only the text direction
 		// and the textAlign will be controlled by textAlign property of the StepInput
 
-		if (sap.ui.getCore().getConfiguration().getRTL()) {
+		if (Configuration.getRTL()) {
 			oRm.attr("dir", "ltr");
 		}
 		// prevent rendering of aria-disabled attribute to avoid having

package/src/sap/m/ObjectAttribute.js

@@ -42,88 +42,91 @@ function(library, Control, coreLibrary, Text, KeyCodes, ObjectAttributeRenderer,
 	 * <code>text</code> property is styled and acts as a link. In this case the <code>text</code>
 	 * property must also be set, as otherwise there will be no link displayed for the user.
 	 * @extends sap.ui.core.Control
-	 * @version 1.106.0
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @since 1.12
 	 * @alias sap.m.ObjectAttribute
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var ObjectAttribute = Control.extend("sap.m.ObjectAttribute", /** @lends sap.m.ObjectAttribute.prototype */ { metadata : {
-
-		library : "sap.m",
-		designtime: "sap/m/designtime/ObjectAttribute.designtime",
-		properties : {
-
-			/**
-			 * Defines the ObjectAttribute title.
-			 */
-			title : {type : "string", group : "Misc", defaultValue : null},
-
-			/**
-			 * Defines the ObjectAttribute text.
-			 */
-			text : {type : "string", group : "Misc", defaultValue : null},
-
-			/**
-			 * Indicates if the <code>ObjectAttribute</code> text is selectable for the user.
-			 *
-			 * <b>Note:</b> As of version 1.48, only the value of the <code>text</code> property becomes active (styled and acts like a link) as opposed to both the <code>title</code> and <code>text</code> in the previous versions. If you set this property to <code>true</code>, you have to also set the <code>text</code> property.
-			 * <b>Note:</b> When <code>active</code> property is set to <code>true</code>, and the text direction of the <code>title</code> or the <code>text</code> does not match the text direction of the application, the <code>textDirection</code> property should be set to ensure correct display.
-			 */
-			active : {type : "boolean", group : "Misc", defaultValue : null},
-
-			/**
-			 * Determines the direction of the text.
-			 * Available options for the text direction are LTR (left-to-right), RTL (right-to-left), or Inherit. By default the control inherits the text direction from its parent control.
-			 */
-			textDirection : {type : "sap.ui.core.TextDirection", group : "Appearance", defaultValue : TextDirection.Inherit},
-
-			/**
-			 * Specifies the value of the <code>aria-haspopup</code> attribute
-			 *
-			 * If the value is <code>None</code>, the attribute will not be rendered. Otherwise it will be rendered with the selected value.
-			 *
-			 * NOTE: Use this property only when an <code>sap.m.ObjectAttribute</code> instance is active and related to a popover/popup.
-			 * The value needs to be equal to the main/root role of the popup - e.g. dialog,
-			 * menu or list (examples: if you have dialog -> dialog, if you have menu -> menu; if you have list -> list; if you have dialog containing a list -> dialog).
-			 * Do not use it, if you open a standard sap.m.Dialog, MessageBox or other type of modal dialogs.
-			 *
-			 * @since 1.97.0
-			 */
-			 ariaHasPopup : {type : "sap.ui.core.aria.HasPopup", group : "Accessibility", defaultValue : AriaHasPopup.None}
-		},
-		aggregations : {
-
-			/**
-			 * When the aggregation is set, it replaces the <code>text</code>, <code>active</code> and <code>textDirection</code> properties. This also ignores the press event. The provided control is displayed as an active link in case it is a sap.m.Link.
-			 * <b>Note:</b> It will only allow sap.m.Text and sap.m.Link controls.
-			 */
-			customContent : {type : "sap.ui.core.Control", multiple : false},
-
-			/**
-			 * Text control to display title and text property.
-			 */
-			_textControl : {type : "sap.ui.core.Control", multiple : false, visibility : "hidden"}
-		},
-		events : {
-
-			/**
-			 * Fires when the user clicks on active text.
-			 */
-			press : {
-				parameters : {
-
-					/**
-					 * DOM reference of the ObjectAttribute's text to be used for positioning.
-					 */
-					domRef : {type : "string"}
+	var ObjectAttribute = Control.extend("sap.m.ObjectAttribute", /** @lends sap.m.ObjectAttribute.prototype */ {
+		metadata : {
+
+			library : "sap.m",
+			designtime: "sap/m/designtime/ObjectAttribute.designtime",
+			properties : {
+
+				/**
+				 * Defines the ObjectAttribute title.
+				 */
+				title : {type : "string", group : "Misc", defaultValue : null},
+
+				/**
+				 * Defines the ObjectAttribute text.
+				 */
+				text : {type : "string", group : "Misc", defaultValue : null},
+
+				/**
+				 * Indicates if the <code>ObjectAttribute</code> text is selectable for the user.
+				 *
+				 * <b>Note:</b> As of version 1.48, only the value of the <code>text</code> property becomes active (styled and acts like a link) as opposed to both the <code>title</code> and <code>text</code> in the previous versions. If you set this property to <code>true</code>, you have to also set the <code>text</code> property.
+				 * <b>Note:</b> When <code>active</code> property is set to <code>true</code>, and the text direction of the <code>title</code> or the <code>text</code> does not match the text direction of the application, the <code>textDirection</code> property should be set to ensure correct display.
+				 */
+				active : {type : "boolean", group : "Misc", defaultValue : null},
+
+				/**
+				 * Determines the direction of the text.
+				 * Available options for the text direction are LTR (left-to-right), RTL (right-to-left), or Inherit. By default the control inherits the text direction from its parent control.
+				 */
+				textDirection : {type : "sap.ui.core.TextDirection", group : "Appearance", defaultValue : TextDirection.Inherit},
+
+				/**
+				 * Specifies the value of the <code>aria-haspopup</code> attribute
+				 *
+				 * If the value is <code>None</code>, the attribute will not be rendered. Otherwise it will be rendered with the selected value.
+				 *
+				 * NOTE: Use this property only when an <code>sap.m.ObjectAttribute</code> instance is active and related to a popover/popup.
+				 * The value needs to be equal to the main/root role of the popup - e.g. dialog,
+				 * menu or list (examples: if you have dialog -> dialog, if you have menu -> menu; if you have list -> list; if you have dialog containing a list -> dialog).
+				 * Do not use it, if you open a standard sap.m.Dialog, MessageBox or other type of modal dialogs.
+				 *
+				 * @since 1.97.0
+				 */
+				 ariaHasPopup : {type : "sap.ui.core.aria.HasPopup", group : "Accessibility", defaultValue : AriaHasPopup.None}
+			},
+			aggregations : {
+
+				/**
+				 * When the aggregation is set, it replaces the <code>text</code>, <code>active</code> and <code>textDirection</code> properties. This also ignores the press event. The provided control is displayed as an active link in case it is a sap.m.Link.
+				 * <b>Note:</b> It will only allow sap.m.Text and sap.m.Link controls.
+				 */
+				customContent : {type : "sap.ui.core.Control", multiple : false},
+
+				/**
+				 * Text control to display title and text property.
+				 */
+				_textControl : {type : "sap.ui.core.Control", multiple : false, visibility : "hidden"}
+			},
+			events : {
+
+				/**
+				 * Fires when the user clicks on active text.
+				 */
+				press : {
+					parameters : {
+
+						/**
+						 * DOM reference of the ObjectAttribute's text to be used for positioning.
+						 */
+						domRef : {type : "string"}
+					}
 				}
-			}
+			},
+			dnd: { draggable: true, droppable: false }
 		},
-		dnd: { draggable: true, droppable: false }
-	}});
+
+		renderer: ObjectAttributeRenderer
+	});
 
 	/**
 	 *  Initializes member variables.

package/src/sap/m/ObjectAttributeRenderer.js

@@ -3,8 +3,8 @@
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(["sap/ui/core/library"],
-	function(coreLibrary) {
+sap.ui.define(["sap/ui/core/library", "sap/ui/core/Configuration"],
+	function(coreLibrary, Configuration) {
 	"use strict";
 
 
@@ -112,7 +112,7 @@ sap.ui.define(["sap/ui/core/library"],
 		oRm.openStart("span", oOA.getId() + "-colon");
 		oRm.class("sapMObjectAttributeColon");
 		oRm.openEnd();
-		if (sap.ui.getCore().getConfiguration().getLocale().getLanguage().toLowerCase() === "fr") {
+		if (Configuration.getLocale().getLanguage().toLowerCase() === "fr") {
 			sColon = " " + sColon;
 		}
 		oRm.text(sColon);