2006-12-11 Igor Zelmanovich <igorz@mainsoft.com>

	* TreeView.cs: fixed: ResolveClientUrl used with ImageUrl and NavigateUrl

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 96bd2e19d4a07da4594e75ed4521639512bf9198..3f7e86b0445758bda3723dc73793a11cb9f20b9c 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-11 Igor Zelmanovich <igorz@mainsoft.com>
+
+       * TreeView.cs: fixed: ResolveClientUrl used with ImageUrl and NavigateUrl
+
 2006-12-14  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * Login.cs: refactored rendering, fixed OnAuthenticate event

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
index d893154fca463eaf5439e9f70747dc35a30fbd1c..8bb86cc20910e2922ae60213e928e0ace98e5820 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
@@ -1373,8 +1373,8 @@ namespace System.Web.UI.WebControls
                        
                        // Node icon
                        
-                       string imageUrl = node.ImageUrl;
-                       if (imageUrl == "" && imageStyle != null) {
+                       string imageUrl = node.ImageUrl.Length > 0 ? ResolveClientUrl (node.ImageUrl) : null;
+                       if (String.IsNullOrEmpty (imageUrl) && imageStyle != null) {
                                if (imageStyle.RootIcon != null && node.IsRootNode)
                                        imageUrl = GetNodeIconUrl (imageStyle.RootIcon);
                                else if (imageStyle.ParentIcon != null && node.IsParentNode)
@@ -1383,7 +1383,7 @@ namespace System.Web.UI.WebControls
                                        imageUrl = GetNodeIconUrl (imageStyle.LeafIcon);
                        }
                        
-                       if (imageUrl != "") {
+                       if (!String.IsNullOrEmpty (imageUrl)) {
                                writer.RenderBeginTag (HtmlTextWriterTag.Td);   // TD
                                BeginNodeTag (writer, node, clientExpand);
                                writer.AddAttribute ("src", imageUrl);
@@ -1656,7 +1656,7 @@ namespace System.Web.UI.WebControls
                                writer.AddAttribute ("title", node.ToolTip);
 
                        if (node.NavigateUrl != "") {
-                               writer.AddAttribute ("href", node.NavigateUrl);
+                               writer.AddAttribute ("href", ResolveClientUrl (node.NavigateUrl));
                                if (node.Target.Length > 0)
                                        writer.AddAttribute ("target", node.Target);
                                else if (Target.Length > 0)