@openui5/sap.m 1.71.44 → 1.71.47

package/src/sap/m/RadioButton.js

@@ -8,10 +8,10 @@
 sap.ui.define([
 	'./library',
 	'sap/ui/core/Control',
+	'sap/ui/core/Core',
 	'sap/ui/core/EnabledPropagator',
 	'sap/ui/core/message/MessageMixin',
-	'./RadioButtonGroup',
-	'./Label',
+	'sap/m/Label',
 	'sap/ui/core/library',
 	'sap/base/strings/capitalize',
 	'./RadioButtonRenderer'
@@ -19,9 +19,9 @@ sap.ui.define([
 function(
 	library,
 	Control,
+	Core,
 	EnabledPropagator,
 	MessageMixin,
-	RadioButtonGroup,
 	Label,
 	coreLibrary,
 	capitalize,
@@ -29,8 +29,6 @@ function(
 	) {
 	"use strict";
 
-
-
 	// shortcut for sap.ui.core.TextAlign
 	var TextAlign = coreLibrary.TextAlign;
 
@@ -40,7 +38,12 @@ function(
 	// shortcut for sap.ui.core.TextDirection
 	var TextDirection = coreLibrary.TextDirection;
 
-
+	var getNextSelectionNumber = (function () {
+		var i = 0;
+		return function () {
+			return i++;
+		};
+	}());
 
 	/**
 	 * Constructor for a new RadioButton.
@@ -84,7 +87,7 @@ function(
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.71.44
+	 * @version 1.71.47
 	 *
 	 * @constructor
 	 * @public
@@ -93,11 +96,9 @@ function(
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var RadioButton = Control.extend("sap.m.RadioButton", /** @lends sap.m.RadioButton.prototype */ { metadata : {
-
 		interfaces : ["sap.ui.core.IFormContent"],
 		library : "sap.m",
 		properties : {
-
 			/**
 			 * Specifies if the radio button is disabled.
 			 */
@@ -178,7 +179,6 @@ function(
 
 		},
 		events : {
-
 			/**
 			 * Event is triggered when the user makes a change on the radio button (selecting or unselecting it).
 			 */
@@ -193,7 +193,6 @@ function(
 			}
 		},
 		associations : {
-
 			/**
 			 * Association to controls / IDs which describe this control (see WAI-ARIA attribute aria-describedby).
 			 */
@@ -214,6 +213,8 @@ function(
 	// and have valueState property of the RadioButton set to the message type.
 	MessageMixin.call(RadioButton.prototype);
 
+	RadioButton.getNextSelectionNumber = getNextSelectionNumber;
+
 	RadioButton.prototype._groupNames = {};
 
 	// Keyboard navigation variants
@@ -224,13 +225,49 @@ function(
 		PREV: "prev"
 	};
 
+	RadioButton.prototype.init = function () {
+		this._iSelectionNumber = -1;
+	};
+
+	RadioButton.prototype.onBeforeRendering = function() {
+		var sGroupName = this.getGroupName();
+
+		this._updateGroupName(sGroupName);
+		this._updateLabelProperties();
+
+		// If this radio button is selected, explicitly deselect the other radio buttons in the same group
+		if (this.getSelected() && sGroupName !== "" && this._isLastSelectedInGroup(sGroupName)) {
+			this._deselectOthersInGroup(sGroupName);
+		}
+	};
+
+	/**
+	 * Destroys all related objects to the RadioButton
+	 * @public
+	 */
+	RadioButton.prototype.exit = function() {
+		var sGroupName = this.getGroupName(),
+			aControlsInGroup = this._groupNames[sGroupName],
+			iGroupNameIndex = aControlsInGroup && aControlsInGroup.indexOf(this);
+
+		this._iTabIndex = null;
+
+		if (this._oLabel) {
+			this._oLabel.destroy();
+			this._oLabel = null;
+		}
+
+		if (iGroupNameIndex >= -1) {
+			aControlsInGroup.splice(iGroupNameIndex, 1);
+		}
+	};
+
 	/**
 	 * Function is called when the radio button is tapped.
 	 * @param {jQuery.Event} oEvent The event object
 	 * @private
 	 */
 	RadioButton.prototype.ontap = function(oEvent) {
-
 		if (!this.getEnabled() || !this.getEditable()) {
 			return;
 		}
@@ -238,7 +275,7 @@ function(
 		var oParent = this.getParent();
 
 		// check if the RadioButton is part of a RadioButtonGroup which is disabled/readonly
-		if (oParent instanceof RadioButtonGroup && (!oParent.getEnabled() || !oParent.getEditable())) {
+		if (oParent && oParent.isA("sap.m.RadioButtonGroup") && (!oParent.getEnabled() || !oParent.getEditable())) {
 			return;
 		}
 
@@ -258,22 +295,49 @@ function(
 		}
 	};
 
+	/**
+	 * Sets RadioButton's groupName. Only one radioButton from the same group can be selected
+	 * @param {string} sGroupName - Name of the group to which the RadioButton will belong.
+	 * @returns {this} Reference to the control instance for chaining
+	 * @public
+	 */
+	RadioButton.prototype.setGroupName = function(sGroupName) {
+		this._updateGroupName(sGroupName, this.getGroupName());
+		this.setProperty("groupName", sGroupName);
+		return this;
+	};
+
+	/**
+	 * Sets the state of the RadioButton to selected.
+	 * @param {boolean} bSelected - defines if the radio button is selected
+	 * @returns {this} Reference to the control instance for chaining
+	 * @public
+	 */
+	RadioButton.prototype.setSelected = function(bSelected) {
+		this.setProperty("selected", bSelected);
+
+		if (this.getSelected()) {
+			this._iSelectionNumber = getNextSelectionNumber();
+		}
+
+		return this;
+	};
+
 	/**
 	 * Function is called when radiobutton is being touched. Only necessary for Android/Blackberry.
 	 * @param {jQuery.Event} oEvent The event object
 	 * @private
 	 */
-	RadioButton.prototype.ontouchstart = function(oEvent) {
-
+	RadioButton.prototype.ontouchstart = function (oEvent) {
 		//for control who need to know if they should handle events from the CheckBox control
-		oEvent.originalEvent._sapui_handledByControl = true;
+		oEvent.setMarked();
 		if (this.getEnabled() && this.getActiveHandling()) {
-			this.$().toggleClass("sapMRbBTouched", true);
+			this.addStyleClass("sapMRbBTouched");
 		}
 	};
 
-	RadioButton.prototype.ontouchend = function(oEvent) {
-		this.$().toggleClass("sapMRbBTouched", false);
+	RadioButton.prototype.ontouchend = function () {
+		this.removeStyleClass("sapMRbBTouched");
 	};
 
 	RadioButton.prototype.onsapnext = function(oEvent) {
@@ -355,7 +419,7 @@ function(
 	 * @private
 	 */
 	RadioButton.prototype._keyboardHandler = function(sPosition, bSelect) {
-		if (this.getParent() instanceof RadioButtonGroup) {
+		if (this.getParent() && this.getParent().isA("sap.m.RadioButtonGroup")) {
 			return;
 		}
 
@@ -373,20 +437,20 @@ function(
 	/**
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 * @protected
-	 * @returns {Object} The <code>sap.m.RadioButton</code> accessibility information
+	 * @returns {object} The <code>sap.m.RadioButton</code> accessibility information
 	 */
 	RadioButton.prototype.getAccessibilityInfo = function() {
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oBundle = Core.getLibraryResourceBundle("sap.m");
 		return {
 			role: "radio",
 			type: oBundle.getText("ACC_CTR_TYPE_RADIO"),
-			description: (this.getText() || "") + (this.getSelected() ? (" " + oBundle.getText("ACC_CTR_STATE_CHECKED")) : ""),
+			description: (this.getText() || "") + (this.getSelected() ? (" " + oBundle.getText("ACC_CTR_STATE_CHECKED")) : (" " + oBundle.getText("ACC_CTR_STATE_NOT_CHECKED"))),
 			enabled: this.getEnabled(),
 			editable: this.getEditable()
 		};
 	};
 
-	/*
+	/**
 	 * RadioButton without label must not be stretched in Form.
 	 */
 	RadioButton.prototype.getFormDoNotAdjustWidth = function() {
@@ -397,7 +461,7 @@ function(
 	 * Determines next focusable item
 	 *
 	 * @param {enum} sNavigation any item from KH_NAVIGATION
-	 * @returns {RadioButton} Control instance for method chaining
+	 * @returns {sap.m.RadioButton} Next focusable radio button
 	 * @private
 	 */
 	RadioButton.prototype._getNextFocusItem = function(sNavigation) {
@@ -441,175 +505,11 @@ function(
 		this.ontap(oEvent);
 	};
 
-	RadioButton.prototype.setEnabled = function(bEnabled) {
-		this.setProperty("enabled", bEnabled, false);
-
-		return this;
-	};
-
-
-
 	// #############################################################################
-	// Overwritten methods that are also generated in RadioButton.API.js
+	// Overwritten & private methods
 	// #############################################################################
 
 	/**
-	 * Sets the state of the RadioButton to selected.
-	 * @param {boolean} bSelected - defines if the radio button is selected
-	 * @returns {sap.m.RadioButton} Reference to the control instance for chaining
-	 * @public
-	 */
-	RadioButton.prototype.setSelected = function(bSelected) {
-		var oControl,
-			bSelectedOld = this.getSelected(),
-			sGroupName = this.getGroupName(),
-			aControlsInGroup = this._groupNames[sGroupName],
-			iLength = aControlsInGroup && aControlsInGroup.length;
-
-		this.setProperty("selected", bSelected, true); // No re-rendering
-		this._changeGroupName(this.getGroupName());
-
-		if (!!bSelected && sGroupName && sGroupName !== "") { // If this radio button is selected and groupName is set, explicitly deselect the other radio buttons of the same group
-			for (var i = 0; i < iLength; i++) {
-				oControl = aControlsInGroup[i];
-
-				if (oControl instanceof RadioButton && oControl !== this && oControl.getSelected()) {
-					oControl.fireSelect({ selected: false });
-					oControl.setSelected(false);
-				}
-			}
-		}
-
-		if ((bSelectedOld !== !!bSelected) && this.getDomRef()) {
-			this.$().toggleClass("sapMRbSel", bSelected);
-
-			if (bSelected) {
-				this.getDomRef().setAttribute("aria-checked", "true");
-				this.getDomRef("RB").checked = true;
-				this.getDomRef("RB").setAttribute("checked", "checked");
-			} else {
-				this.getDomRef().removeAttribute("aria-checked"); // aria-checked=false is default value and need not be set explicitly
-				this.getDomRef("RB").checked = false;
-				this.getDomRef("RB").removeAttribute("checked");
-			}
-		}
-
-		return this;
-	};
-
-	/**
-	 * Sets the text for the RadioButton's label.
-	 * @param {string} sText - The text to be set
-	 * @returns {sap.m.RadioButton} Reference to the control instance for chaining
-	 * @public
-	 */
-	RadioButton.prototype.setText = function(sText) {
-		this.setProperty("text", sText, true);
-
-		if (this._oLabel) {
-			this._oLabel.setText(this.getText());
-		} else {
-			this._createLabel("text", this.getText());
-		}
-
-		this.toggleStyleClass("sapMRbHasLabel", !!sText);
-
-		return this;
-	};
-
-	/**
-	 * Depeding on useEntireWidth sets the width to the RadioButton's label or the whole RadioButton
-	 * @param {boolean} bUserEntireWidth - Determines if the width will be set to the label only or to the whole RadioButton
-	 * @private
-	 */
-	RadioButton.prototype._setWidth = function(bUserEntireWidth) {
-		if (!bUserEntireWidth) {
-			this._setLableWidth();
-		} else {
-			this._setLableWidth("auto");
-		}
-	};
-
-	/**
-	 * Sets the width for the RadioButton's label.
-	 * @param {string} sWidth - CSS size to be set as width
-	 * @private
-	 */
-	RadioButton.prototype._setLableWidth = function(sWidth) {
-		sWidth = sWidth || this.getWidth();
-
-		if (this._oLabel) {
-			this._oLabel.setWidth(sWidth);
-		} else {
-			this._createLabel("width", sWidth);
-		}
-	};
-
-	/**
-	 * Sets the text direction for the RadioButton's label.
-	 * @param {string} sDirection - Text direction to be set to RadioButton's label
-	 * @returns {sap.m.RadioButton} Reference to the control instance for chaining
-	 * @public
-	 */
-	RadioButton.prototype.setTextDirection = function(sDirection) {
-
-		this.setProperty("textDirection", sDirection, true);
-		if (this._oLabel) {
-			this._oLabel.setTextDirection(this.getTextDirection());
-		} else {
-			this._createLabel("textDirection", this.getTextDirection());
-		}
-		return this;
-	};
-
-	/**
-	 * Sets RadioButton's groupName. Only one radioButton from the same group can be selected
-	 * @param {string} sGroupName - Name of the group to which the RadioButton will belong.
-	 * @returns {sap.m.RadioButton} Reference to the control instance for chaining
-	 * @public
-	 */
-	RadioButton.prototype.setGroupName = function(sGroupName) {
-		this._changeGroupName(sGroupName, this.getGroupName());
-		return this.setProperty("groupName", sGroupName, true);
-	};
-
-	RadioButton.prototype.onBeforeRendering = function() {
-		// Set the width before rendering as both width and useEntireWidth are dependent
-		this._setWidth(this.getUseEntireWidth());
-		return this._changeGroupName(this.getGroupName());
-	};
-
-	/**
-	 * Destroys all related objects to the RadioButton
-	 * @public
-	 */
-	RadioButton.prototype.exit = function() {
-		var sGroupName = this.getGroupName(),
-			aControlsInGroup = this._groupNames[sGroupName],
-			iGroupNameIndex = aControlsInGroup && aControlsInGroup.indexOf(this);
-
-		this._iTabIndex = null;
-		if (this._oLabel) {
-			this._oLabel.destroy();
-		}
-
-		if (iGroupNameIndex >= -1) {
-			aControlsInGroup.splice(iGroupNameIndex, 1);
-		}
-	};
-
-	/**
-	 * Creates label and sets a property to it.
-	 * @param {string} prop - Property to be set to the new label.
-	 * @param {string} value - Value of the property which will be set.
-	 * @private
-	 */
-	RadioButton.prototype._createLabel = function(prop, value) {
-		this._oLabel = new Label(this.getId() + "-label").addStyleClass("sapMRbBLabel").setParent(this, null, true);
-		this._oLabel.setProperty(prop, value, false);
-	};
-
-	/*
 	 * Sets the tab index of the control
 	 *
 	 * @param {int} iTabIndex - Greater than or equal to -1
@@ -628,23 +528,6 @@ function(
 		return this;
 	};
 
-	/*
-	 * Sets the textAlign to the internal label
-	 * @param {string} sAlign
-	 * @return {sap.m.RadioButton}
-	 * @since 1.28
-	 * @public
-	 */
-	RadioButton.prototype.setTextAlign = function(sAlign) {
-		this.setProperty("textAlign", sAlign, true);
-		if (this._oLabel) {
-			this._oLabel.setTextAlign(this.getTextAlign());
-		} else {
-			this._createLabel("textAlign", this.getTextAlign());
-		}
-		return this;
-	};
-
 	/**
 	 * Sets the private valueStateText property. Required, in order to make the MessageMixin work.
 	 *
@@ -653,16 +536,48 @@ function(
 	 * @returns {sap.m.RadioButton} Reference to the control instance for chaining.
 	 */
 	RadioButton.prototype.setValueStateText = function(sText) {
-		return this.setProperty("valueStateText", sText, true);
+		return this.setProperty("valueStateText", sText);
 	};
 
 	/**
-	 * Changes the groupname of a RadioButton.
+	 * Maintains the RadioButton's internal Label's text property.
+	 * @param {string} sText - The text to be set
+	 * @public
+	 */
+	RadioButton.prototype._updateLabelProperties = function () {
+		var oLabel = this._getLabel();
+		var sText = this.getText();
+		var bUseEntireWidth = this.getUseEntireWidth();
+
+		this.toggleStyleClass("sapMRbHasLabel", !!sText);
+
+		// Set the width before rendering as both width and useEntireWidth are dependent
+		oLabel.setText(sText)
+			.setWidth(!bUseEntireWidth ? this.getWidth() : "auto")
+			.setTextDirection(this.getTextDirection())
+			.setTextAlign(this.getTextAlign());
+	};
+
+	/**
+	 * Returns the RadioButton's internal Label control.
+	 * @private
+	 */
+	RadioButton.prototype._getLabel = function () {
+		if (!this._oLabel) {
+			this._oLabel = new Label(this.getId() + "-label");
+			this._oLabel.addStyleClass("sapMRbBLabel").setParent(this, null, true);
+		}
+
+		return this._oLabel;
+	};
+
+	/**
+	 * Update the groupname of a RadioButton.
 	 * @param {string} sNewGroupName - Name of the new group.
 	 * @param {string} sOldGroupName - Name of the old group.
 	 * @private
 	 */
-	RadioButton.prototype._changeGroupName = function(sNewGroupName, sOldGroupName) {
+	RadioButton.prototype._updateGroupName = function (sNewGroupName, sOldGroupName) {
 		var aNewGroup = this._groupNames[sNewGroupName],
 			aOldGroup = this._groupNames[sOldGroupName];
 
@@ -679,6 +594,28 @@ function(
 		}
 	};
 
+	RadioButton.prototype._isLastSelectedInGroup = function (sGroupName) {
+		var aControlsInGroup = this._groupNames[sGroupName];
+
+		return aControlsInGroup.every(function (aButton) {
+			return aButton._iSelectionNumber <= this._iSelectionNumber;
+		}.bind(this));
+	};
+
+	RadioButton.prototype._deselectOthersInGroup = function (sGroupName) {
+		var aControlsInGroup = this._groupNames[sGroupName],
+			iLength = aControlsInGroup && aControlsInGroup.length;
+
+		for (var i = 0; i < iLength; i++) {
+			var oControl = aControlsInGroup[i];
+
+			if (oControl instanceof RadioButton && oControl !== this && oControl.getSelected()) {
+				oControl.fireSelect({ selected: false });
+				oControl.setSelected(false);
+			}
+		}
+	};
+
 	// Private properties setter generation
 	["editableParent"].forEach(function(privatePropName) {
 		RadioButton.prototype["_set" + capitalize(privatePropName)] = function (vValue) {
@@ -688,5 +625,4 @@ function(
 	});
 
 	return RadioButton;
-
-});
+});