Browse Source

2007-02-13 Igor Zelmanovich <[email protected]>

	* TreeView.js: refactoring:
	removed TreeView_ErrorCallback, used TreeView_PopulateCallback instead.

svn path=/trunk/mcs/; revision=72782
Igor Zelmanovich 19 years ago
parent
commit
94c2fb3430

+ 5 - 0
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,8 @@
+2007-02-13 Igor Zelmanovich <[email protected]>
+
+	* TreeView.js: refactoring:
+	removed TreeView_ErrorCallback, used TreeView_PopulateCallback instead.
+	
 2007-02-13 Adar Wesley <[email protected]>
 
 	* ObjectDataSourceView.cs: fixed parameter merging and added more tests

+ 1 - 12
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 (tree.uid, nodeId, TreeView_PopulateCallback, treeId + " " + nodeId, TreeView_ErrorCallback)
+		WebForm_DoCallback (tree.uid, nodeId, TreeView_PopulateCallback, treeId + " " + nodeId, TreeView_PopulateCallback)
 		return;
 	}
 	
@@ -70,17 +70,6 @@ function TreeView_PopulateCallback (data, ids)
 	}
 }
 
-function TreeView_ErrorCallback (data, ids)
-{
-	var idArray = ids.split (" ");
-	var node = document.getElementById (idArray[0] + "_" + idArray[1]);
-	node.innerHTML = data;
-	node.populated = true;
-	TreeView_ToggleExpand (idArray[0], idArray[1]);
-	node.populated = false;
-	node.hasError = true;
-}
-
 function getTree (treeId) { try { return eval (treeId + "_data"); } catch(e) { return null; } }
 function getNodeLink (node) { return node.childNodes[node.childNodes.length - 1]; }