Author: igorz
Date: 2006-12-17 06:20:51 -0500 (Sun, 17 Dec 2006)
New Revision: 69596

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
Log:
2006-12-11 Igor Zelmanovich <[EMAIL PROTECTED]>

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



Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2006-12-17 11:08:06 UTC (rev 69595)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2006-12-17 11:20:51 UTC (rev 69596)
@@ -1,3 +1,7 @@
+2006-12-11 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+       * TreeView.cs: fixed: ResolveClientUrl used with ImageUrl and 
NavigateUrl
+
 2006-12-14  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
        * Login.cs: refactored rendering, fixed OnAuthenticate event

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs    
2006-12-17 11:08:06 UTC (rev 69595)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs    
2006-12-17 11:20:51 UTC (rev 69596)
@@ -1373,8 +1373,8 @@
                        
                        // 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 @@
                                        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 @@
                                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)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to