Author: igorz
Date: 2006-09-12 08:25:03 -0400 (Tue, 12 Sep 2006)
New Revision: 65298

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
   trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
Log:
corrected rendering

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2006-09-12 12:01:03 UTC (rev 65297)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2006-09-12 12:25:03 UTC (rev 65298)
@@ -1,3 +1,8 @@
+2006-09-12 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+       * TreeView.cs: corrected rendering
+       * TreeNode.cs:  
+
 2006-09-11  Konstantin Triger <[EMAIL PROTECTED]>
 
        * Login.cs: ensure the urls are correctly resolved.

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs    
2006-09-12 12:01:03 UTC (rev 65297)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs    
2006-09-12 12:25:03 UTC (rev 65298)
@@ -713,11 +713,11 @@
                }
                                
                internal bool IsParentNode {
-                       get { return ChildNodes.Count > 0 || PopulateOnDemand; }
+                       get { return ChildNodes.Count > 0 || (PopulateOnDemand 
&& !Populated); }
                }
                
                internal bool IsLeafNode {
-                       get { return ChildNodes.Count == 0 && 
!PopulateOnDemand; }
+                       get { return !IsParentNode; }
                }
                
                internal bool IsRootNode {

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs    
2006-09-12 12:01:03 UTC (rev 65297)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs    
2006-09-12 12:25:03 UTC (rev 65298)
@@ -590,7 +590,7 @@
                                return (TreeNodeTypes)ViewState.GetInt 
("ShowCheckBoxes", (int)TreeNodeTypes.None);
                        }
                        set {
-                               if (!Enum.IsDefined (typeof (TreeNodeTypes), 
value))
+                               if ((int) value > 7)
                                        throw new ArgumentOutOfRangeException 
();
                                ViewState ["ShowCheckBoxes"] = value;
                        }
@@ -1301,18 +1301,14 @@
                        writer.RenderBeginTag (HtmlTextWriterTag.Tr);
                        
                        // Vertical lines from previous levels
-                       
+
+                       nodeImage = GetNodeImageUrl ("i", imageStyle);
                        for (int n=0; n<level; n++) {
                                writer.RenderBeginTag (HtmlTextWriterTag.Td);
                                writer.AddStyleAttribute ("width", NodeIndent + 
"px");
                                writer.AddStyleAttribute ("height", "1px");
                                writer.RenderBeginTag (HtmlTextWriterTag.Div);
-                               if (ShowLines) {
-                                       if (levelLines [n] == null)
-                                               nodeImage = GetNodeImageUrl 
("noexpand", imageStyle);
-                                       else
-                                               nodeImage = GetNodeImageUrl 
("i", imageStyle);
-
+                               if (ShowLines && levelLines [n] != null) {
                                        writer.AddAttribute ("src", nodeImage);
                                        writer.AddAttribute 
(HtmlTextWriterAttribute.Alt, "");
                                        writer.RenderBeginTag 
(HtmlTextWriterTag.Img);
@@ -1391,8 +1387,8 @@
                                writer.RenderBeginTag (HtmlTextWriterTag.Td);   
// TD
                                BeginNodeTag (writer, node, clientExpand);
                                writer.AddAttribute ("src", imageUrl);
-                               writer.AddAttribute ("border", "0");
-                               if (node.ImageToolTip != "") 
writer.AddAttribute ("alt", node.ImageToolTip);
+                               writer.AddStyleAttribute 
(HtmlTextWriterStyle.BorderWidth, "0");
+                               writer.AddAttribute ("alt", node.ImageToolTip);
                                writer.RenderBeginTag (HtmlTextWriterTag.Img);
                                writer.RenderEndTag (); // IMG
                                writer.RenderEndTag (); // style tag
@@ -1415,9 +1411,9 @@
                                showChecks = node.ShowCheckBox.Value;
                        else
                                showChecks = (ShowCheckBoxes == 
TreeNodeTypes.All) ||
-                                                        (ShowCheckBoxes == 
TreeNodeTypes.Leaf && node.IsLeafNode) ||
-                                                        (ShowCheckBoxes == 
TreeNodeTypes.Parent && node.IsParentNode && node.Parent != null) ||
-                                                        (ShowCheckBoxes == 
TreeNodeTypes.Root && node.Parent == null && node.ChildNodes.Count > 0);
+                                                        ((ShowCheckBoxes & 
TreeNodeTypes.Leaf) > 0 && node.IsLeafNode) ||
+                                                        ((ShowCheckBoxes & 
TreeNodeTypes.Parent) > 0 && node.IsParentNode && node.Parent != null) ||
+                                                        ((ShowCheckBoxes & 
TreeNodeTypes.Root) > 0 && node.Parent == null && node.ChildNodes.Count > 0);
 
                        if (showChecks) {
                                writer.AddAttribute ("name", ClientID + "_cs_" 
+ node.Path);
@@ -1656,10 +1652,15 @@
 
                void BeginNodeTag (HtmlTextWriter writer, TreeNode node, bool 
clientExpand)
                {
+                       if(node.ToolTip.Length>0)
+                               writer.AddAttribute ("title", node.ToolTip);
+
                        if (node.NavigateUrl != "") {
                                writer.AddAttribute ("href", node.NavigateUrl);
-                               if (node.Target != null)
+                               if (node.Target.Length > 0)
                                        writer.AddAttribute ("target", 
node.Target);
+                               else if (Target.Length > 0)
+                                       writer.AddAttribute ("target", Target);
                                writer.RenderBeginTag (HtmlTextWriterTag.A);
                        }
                        else if (node.SelectAction != 
TreeNodeSelectAction.None) {

Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog 
2006-09-12 12:01:03 UTC (rev 65297)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog 
2006-09-12 12:25:03 UTC (rev 65298)
@@ -1,3 +1,7 @@
+2006-09-12 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+       * TableViewTest.cs: fixed test, removed NotWorking attributes
+
 2006-09-11 Igor Zelmanovich <[EMAIL PROTECTED]>
 
        * TableViewTest.cs: fixed tests, removed NotWorking attributes

Modified: 
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs   
2006-09-12 12:01:03 UTC (rev 65297)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs   
2006-09-12 12:25:03 UTC (rev 65298)
@@ -1275,16 +1275,32 @@
 
                // Render Navigate
                [Test]
-               [Category ("NotWorking")]
                [Category ("NunitWeb")]
                public void TreeView_Render_Navigate () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad 
(pageLoadNavigate));
-                       string strTarget = "<a 
href=\"#treeview1_SkipLink\"><img alt=\"Skip Navigation Links.\" 
src=\"/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&amp;t=632883840303269703\"
 width=\"0\" height=\"0\" style=\"border-width:0px;\" /></a><div 
id=\"treeview1\">\r\n\t<table cellpadding=\"0\" cellspacing=\"0\" 
style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><a id=\"treeview1n0\" 
href=\"javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,' 
',treeview1n0Nodes)\"><img 
src=\"/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zW7-1Af97Wq_r6fRK7PDqP81&amp;t=632883840303269703\"
 alt=\"Collapse myNode0\" style=\"border-width:0;\" /></a></td><td 
style=\"white-space:nowrap;\"><a class=\"treeview1_0\" href=\"myUrl0\" 
target=\"myTarget\" onclick=\"javascript:TreeView_SelectNode(treeview1_Data, 
this,'treeview1t0');\" 
id=\"treeview1t0\">myNode0</a></td>\r\n\t\t</tr>\r\n\t</table><div 
id=\"treeview1n0Nodes\" style=\"display:block;\">\r\n\t\t<table 
cellpadding=\"0\" cellspacing=\"0\" sty
 le=\"border-width:0;\">\r\n\t\t\t<tr>\r\n\t\t\t\t<td><div 
style=\"width:20px;height:1px\"></div></td><td><img 
src=\"/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&amp;t=632883840303269703\"
 alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" 
href=\"myUrl00\" target=\"myTarget\" 
onclick=\"javascript:TreeView_SelectNode(treeview1_Data, this,'treeview1t1');\" 
id=\"treeview1t1\">myNode00</a></td>\r\n\t\t\t</tr>\r\n\t\t</table>\r\n\t</div><table
 cellpadding=\"0\" cellspacing=\"0\" 
style=\"border-width:0;\">\r\n\t\t<tr>\r\n\t\t\t<td><img 
src=\"/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&amp;t=632883840303269703\"
 alt=\"\" /></td><td style=\"white-space:nowrap;\"><a class=\"treeview1_0\" 
href=\"myUrl1\" target=\"myTarget\" 
onclick=\"javascript:TreeView_SelectNode(treeview1_Data, this,'treeview1t2');\" 
id=\"treeview1t2\">myNode1</a></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div><a 
id=\"treeview1_SkipLink\"></a>
 ";
+                       #region HTML
+                       string strTarget = @"<a 
href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links."" 
src=""/NunitWeb/WebResource.axd?d=QxfUEifeQdL5PTiZOF8HlA2&amp;t=632900536532114160""
 width=""0"" height=""0"" style=""border-width:0px;"" /></a><div 
id=""treeview1"">
+       <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
+               <tr>
+                       <td><a 
href=""javascript:__doPostBack('treeview1','tmyNode0')""><img 
src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCKx8id-JMenwfEutsU_5Jl881&amp;t=632900536532114160""
 alt=""Collapse myNode0"" style=""border-width:0;"" /></a></td><td 
style=""white-space:nowrap;""><a class=""treeview1_0"" href=""myUrl0"" 
target=""myTarget"" id=""treeview1t0"">myNode0</a></td>
+               </tr>
+       </table><table cellpadding=""0"" cellspacing=""0"" 
style=""border-width:0;"">
+               <tr>
+                       <td><div 
style=""width:20px;height:1px""></div></td><td><img 
src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160""
 alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" 
href=""myUrl00"" target=""myTarget"" id=""treeview1t1"">myNode00</a></td>
+               </tr>
+       </table><table cellpadding=""0"" cellspacing=""0"" 
style=""border-width:0;"">
+               <tr>
+                       <td><img 
src=""/NunitWeb/WebResource.axd?d=FFvd_97uOAs_RkkFT_hCK1PXgyMDQIACCdOOfDo560o1&amp;t=632900536532114160""
 alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0"" 
href=""myUrl1"" target=""myTarget"" id=""treeview1t2"">myNode1</a></td>
+               </tr>
+       </table>
+</div><a id=""treeview1_SkipLink""></a>";
+                       #endregion
                        string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
                        HtmlDiff.AssertAreEqual (strTarget, str, 
"RenderNavigate");
                }
                public static void pageLoadNavigate (Page page) {
                        TreeView tv = new TreeView ();
+                       tv.EnableClientScript = false;
                        tv.ID = "treeview1";
                        tv.Target = "myTarget";
                        tv.Nodes.Add (new TreeNode ());
@@ -1416,7 +1432,6 @@
 
                // Render Images
                [Test]
-               [Category ("NotWorking")]
                [Category ("NunitWeb")]
                public void TreeView_Render_ImagesOn () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad 
(pageLoadImagesOn));
@@ -1634,7 +1649,6 @@
 
                //Render Node Strings
                [Test]
-               [Category ("NotWorking")]
                [Category ("NunitWeb")]
                public void TreeView_Render_NodeStrings () {
                        WebTest t = new WebTest (PageInvoker.CreateOnLoad 
(pageLoadNodeStrings));

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

Reply via email to