Author: igorz
Date: 2007-05-03 10:44:30 -0400 (Thu, 03 May 2007)
New Revision: 76624
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
Log:
merged r76603-76604
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-05-03 14:36:24 UTC (rev 76623)
+++
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-05-03 14:44:30 UTC (rev 76624)
@@ -1,3 +1,12 @@
+2007-05-03 Marek Habersack <[EMAIL PROTECTED]>
+
+ * TreeNode.cs: correct version of the fix in r76488. Nodes
+ retrieved from a navigation data source which have empty URL will
+ not be selectable.
+
+ * TreeView.cs: revert r76488, it wasn't entirely correct. I need
+ to investigate the special cases it solved a bit more.
+
2007-05-03 Igor Zelmanovich <[EMAIL PROTECTED]>
* ControlPropertyNameConverter.css:
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
2007-05-03 14:36:24 UTC (rev 76623)
+++
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
2007-05-03 14:44:30 UTC (rev 76624)
@@ -706,7 +706,10 @@
INavigateUIData navigateUIData = hierarchyData as
INavigateUIData;
if (navigateUIData != null) {
Text = navigateUIData.ToString ();
- NavigateUrl = navigateUIData.NavigateUrl;
+ string url = navigateUIData.NavigateUrl;
+ NavigateUrl = url;
+ if (String.IsNullOrEmpty (url))
+ SelectAction =
TreeNodeSelectAction.None;
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
