@openui5/sap.ui.core 1.96.2 → 1.97.0

package/src/sap/ui/model/odata/ODataPropertyBinding.js

@@ -38,7 +38,7 @@ sap.ui.define([
 			PropertyBinding.apply(this, arguments);
 			this.bInitial = true;
 			this.oValue = this._getValue();
-			this.vOriginalValue;
+			this.vOriginalValue = undefined;
 			this.getDataState().setValue(this.oValue);
 			this.setIgnoreMessages(mParameters && mParameters.ignoreMessages);
 		}
@@ -76,7 +76,7 @@ sap.ui.define([
 		return this.oModel._getObject(this.sPath, this.oContext);
 	};
 
-	/**
+	/*
 	 * @see sap.ui.model.PropertyBinding.prototype.setValue
 	 */
 	ODataPropertyBinding.prototype.setValue = function(oValue){
@@ -95,7 +95,9 @@ sap.ui.define([
 
 
 	/**
-	 * Setter for context
+	 * Setter for context.
+	 *
+	 * @param {sap.ui.model.Context} oContext The context
 	 */
 	ODataPropertyBinding.prototype.setContext = function(oContext) {
 		var bForceUpdate,
@@ -119,8 +121,8 @@ sap.ui.define([
 	 * Check whether this Binding would provide new values and in case it changed,
 	 * inform interested parties about this.
 	 *
-	 * @param {boolean} force no cache true/false: Default = false
-	 *
+	 * @param {boolean} [bForceUpdate=false]
+	 *   Whether an update should be forced regardless of the bindings state
 	 */
 	ODataPropertyBinding.prototype.checkUpdate = function(bForceUpdate){
 		var sCodeListTerm,

package/src/sap/ui/model/odata/ODataTreeBindingAdapter.js

@@ -68,7 +68,11 @@ sap.ui.define(['sap/ui/model/TreeBinding', './v2/ODataTreeBinding', 'sap/ui/mode
 	};
 
 	/**
-	 * Returns true or false, depending on the child count of the given node.
+	 * Returns whether the node has children.
+	 *
+	 * @param {object} oNode The node
+	 * @returns {boolean} Whether the node has children
+	 *
 	 * @private
 	 */
 	ODataTreeBindingAdapter.prototype.nodeHasChildren = function(oNode) {
@@ -86,8 +90,12 @@ sap.ui.define(['sap/ui/model/TreeBinding', './v2/ODataTreeBinding', 'sap/ui/mode
 	};
 
 	/**
-	 * Calculates a group id for the given node.
-	 * The actual group ID differs between hierarchy-annotations and navigation properties.
+	 * Calculates a group id for the given node. The actual group ID differs between
+	 * hierarchy-annotations and navigation properties.
+	 *
+	 * @param {object} oNode The node
+	 * @returns {string} The calculated group id
+	 *
 	 * @private
 	 */
 	ODataTreeBindingAdapter.prototype._calculateGroupID = function (oNode) {
@@ -116,18 +124,18 @@ sap.ui.define(['sap/ui/model/TreeBinding', './v2/ODataTreeBinding', 'sap/ui/mode
 				//odata navigation properties
 				sGroupIDSuffix = oNode.context.sPath.substring(1) + "/";
 			}
-		} else {
+		} else if (this.bHasTreeAnnotations) {
 			//case 2: node sits on root level
-			if (this.bHasTreeAnnotations) {
-				sGroupIDBase = "/";
-				// See comment at replacement above
-				sEncodedValue = (oNode.context.getProperty(this.oTreeProperties["hierarchy-node-for"]) + "").replace(/\//g, "%2F");
-				sGroupIDSuffix = sEncodedValue + "/";
-			} else {
-				//odata nav properties case
-				sGroupIDBase = "/";
-				sGroupIDSuffix = oNode.context.sPath[0] === "/" ? oNode.context.sPath.substring(1) : oNode.context.sPath;
-			}
+			sGroupIDBase = "/";
+			// See comment at replacement above
+			sEncodedValue = (oNode.context.getProperty(this.oTreeProperties["hierarchy-node-for"])
+				+ "").replace(/\//g, "%2F");
+			sGroupIDSuffix = sEncodedValue + "/";
+		} else {
+			//odata nav properties case
+			sGroupIDBase = "/";
+			sGroupIDSuffix = oNode.context.sPath[0] === "/"
+				? oNode.context.sPath.substring(1) : oNode.context.sPath;
 		}
 
 		var sGroupID = sGroupIDBase + sGroupIDSuffix;
@@ -137,10 +145,14 @@ sap.ui.define(['sap/ui/model/TreeBinding', './v2/ODataTreeBinding', 'sap/ui/mode
 
 	/**
 	 * Resets all fields, which are used by the TreeBindingAdapter.
+	 *
+	 * @param {sap.ui.model.Context} [oContext] Only reset specific content matching the context
+	 * @param {object} [mParameters] Additional parameters
+	 *
 	 * @private
 	 */
 	ODataTreeBindingAdapter.prototype.resetData = function(oContext, mParameters) {
-		var vReturn = ODataTreeBinding.prototype.resetData.call(this, oContext, mParameters);
+		ODataTreeBinding.prototype.resetData.call(this, oContext, mParameters);
 
 		// clear the mapping table
 		this._aRowIndexMap = [];
@@ -159,8 +171,6 @@ sap.ui.define(['sap/ui/model/TreeBinding', './v2/ODataTreeBinding', 'sap/ui/mode
 			// clear the tree state
 			this._createTreeState(true);
 		}
-
-		return vReturn;
 	};
 
 	/**