TreeView.cs: corrected rendering: RenderBeginTag, RenderEndTag

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index b31fad607a051832b7c6fe4f96287cdd53e22f91..05eff7c12a261d325e4b028d065c2a3bf3c2dc27 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-09-06 Igor Zelmanovich <igorz@mainsoft.com>
+
+       * TreeView.cs: corrected rendering: RenderBeginTag, RenderEndTag.        
+
 2006-09-06 Igor Zelmanovich <igorz@mainsoft.com>
 
        * TreeView.cs: fixed: when specified value is not one of 

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 bf295adf232138290cf1addb0ddfd09214669294..7421dfa8e917d566a8a319428bb37e6cdaaa5b4a 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
@@ -1076,12 +1076,32 @@ namespace System.Web.UI.WebControls
                
                public override void RenderBeginTag (HtmlTextWriter writer)
                {
+                       if (SkipLinkText != "") {
+                               writer.AddAttribute (HtmlTextWriterAttribute.Href, "#" + ClientID + "_SkipLink");
+                               writer.RenderBeginTag (HtmlTextWriterTag.A);
+
+                               Image img = new Image ();
+                               ClientScriptManager csm = new ClientScriptManager (null);
+                               img.ImageUrl = csm.GetWebResourceUrl (typeof (SiteMapPath), "transparent.gif");
+                               img.Attributes.Add ("height", "0");
+                               img.Attributes.Add ("width", "0");
+                               img.AlternateText = SkipLinkText;
+                               img.Render (writer);
+
+                               writer.RenderEndTag ();
+                       }
                        base.RenderBeginTag (writer);
                }
                
                public override void RenderEndTag (HtmlTextWriter writer)
                {
                        base.RenderEndTag (writer);
+
+                       if (SkipLinkText != "") {
+                               writer.AddAttribute (HtmlTextWriterAttribute.Id, ClientID + "_SkipLink");
+                               writer.RenderBeginTag (HtmlTextWriterTag.A);
+                               writer.RenderEndTag ();
+                       }
                }
                
                void RenderNode (HtmlTextWriter writer, TreeNode node, int level, ArrayList levelLines, bool hasPrevious, bool hasNext)

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
index 6e1ab44bb6bc4fb0cad7f301992d8549cb5b8cd3..83fbfe651b7c607a474c5d28502e75bcd73631ad 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
@@ -6,6 +6,10 @@
 
        * TreeViewTest.cs: removed NotWorking attribute
 
+2006-09-06 Igor Zelmanovich <igorz@mainsoft.com>
+
+       * TreeViewTest.cs: removed NotWorking attribute
+
 2006-09-05 Igor Zelmanovich <igorz@mainsoft.com>
 
        * TreeNodeStyleCollectionTest.cs: New test was added

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
index 1d04a1270e4b6ad6395e04372a5974e7a35d8aad..a83c43896642bf8ccbf04e98d31a1c710803f20c 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
@@ -719,12 +719,11 @@ namespace MonoTests.System.Web.UI.WebControls {
                }\r
 \r
                [Test]\r
-               [Category ("NotWorking")]\r
                [Category ("NunitWeb")]\r
                public void TreeView_Method_RenderTags () {\r
                        new WebTest (PageInvoker.CreateOnLoad (pageLoadRenderTags)).Run ();\r
                }\r
-               private static void pageLoadRenderTags (Page page) {\r
+               public static void pageLoadRenderTags (Page page) {\r
                        TreeView tv = new TreeView ();\r
                        tv.ID = "treeview1";\r
                        page.Form.Controls.Add (tv);\r