2007-01-30 Igor Zelmanovich <[email protected]>

	* TreeView.cs:
	* TreeView.js:
	fixed PopulateOnDemand: used UniqueID to call WebForms_DoCallBack().


svn path=/trunk/mcs/; revision=71969

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,9 @@
+2007-01-30 Igor Zelmanovich <[email protected]>
+
+	* TreeView.cs:
+	* TreeView.js:
+	fixed PopulateOnDemand: used UniqueID to call WebForms_DoCallBack().
+
 2007-01-29 Igor Zelmanovich <[email protected]>
 
 	* MultyView.cs: OnActiveViewChanged is called.

mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs

@@ -1051,7 +1051,8 @@ namespace System.Web.UI.WebControls
 			}
 			
 			string ctree = ClientID + "_data";
-			string script = string.Format ("var {0} = new Object ();\n", ctree);
+			string script = string.Format ("var {0} = new Object ();\n", ctree);
+			script += string.Format ("{0}.uid = {1};\n", ctree, ClientScriptManager.GetScriptLiteral (UniqueID));
 			script += string.Format ("{0}.showImage = {1};\n", ctree, ClientScriptManager.GetScriptLiteral (ShowExpandCollapse));
 			
 			if (ShowExpandCollapse) {

mcs/class/System.Web/System.Web.UI.WebControls/TreeView.js

@@ -8,7 +8,7 @@ function TreeView_ToggleExpand (treeId, nodeId) {
 	var expand = node.style.display == "none";
 	
 	if (tree.populateFromClient && expand && node.populated != true && (node.innerHTML.length == 0 || node.hasError)) {
-		WebForm_DoCallback (treeId, nodeId, TreeView_PopulateCallback, treeId + " " + nodeId, TreeView_ErrorCallback)
+		WebForm_DoCallback (tree.uid, nodeId, TreeView_PopulateCallback, treeId + " " + nodeId, TreeView_ErrorCallback)
 		return;
 	}