Author: igorz
Date: 2007-02-11 09:28:45 -0500 (Sun, 11 Feb 2007)
New Revision: 72614

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
   trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
Log:
2007-02-11 Igor Zelmanovich <[EMAIL PROTECTED]>

        * DataList.cs: fixed: OnBubbleEvent() will return true if event is 
handled 


Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-02-11 14:02:31 UTC (rev 72613)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-02-11 14:28:45 UTC (rev 72614)
@@ -1,3 +1,7 @@
+2007-02-11 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+       * DataList.cs: fixed: OnBubbleEvent() will return true if event is 
handled 
+
 2007-02-09  Gert Driesen  <[EMAIL PROTECTED]>
 
        * FontUnit.cs: Fixed ToString () to use current locale.

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs    
2007-02-11 14:02:31 UTC (rev 72613)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs    
2007-02-11 14:28:45 UTC (rev 72614)
@@ -683,22 +683,17 @@
                        OnItemCommand (dlca);
                        if (String.Compare (cn, CancelCommandName, true, inv) 
== 0) {
                                OnCancelCommand (dlca);
-                               return true;
                        } else if (String.Compare (cn, DeleteCommandName, true, 
inv) == 0) {
                                OnDeleteCommand (dlca);
-                               return true;
                        } else if (String.Compare (cn, EditCommandName, true, 
inv) == 0) {
                                OnEditCommand (dlca);
-                               return true;
                        } else if (String.Compare (cn, SelectCommandName, true, 
inv) == 0) {
                                SelectedIndex = dlca.Item.ItemIndex;
                                OnSelectedIndexChanged (dlca);
-                               return true;
                        } else if (String.Compare (cn, UpdateCommandName, true, 
inv) == 0) {
                                OnUpdateCommand (dlca);
-                               return true;
                        }
-                       return false;
+                       return true;
                }
 
                protected virtual void OnCancelCommand 
(DataListCommandEventArgs e)

Modified: 
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs   
2007-02-11 14:02:31 UTC (rev 72613)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs   
2007-02-11 14:28:45 UTC (rev 72614)
@@ -138,9 +138,9 @@
                        OnSelectedIndexChanged (e);
                }
 
-               public void DoBubbleEvent (object source, EventArgs e)
+               public bool DoBubbleEvent (object source, EventArgs e)
                {
-                       OnBubbleEvent (source, e);
+                       return OnBubbleEvent (source, e);
                }
        }
 
@@ -960,6 +960,17 @@
                        dl.DoBubbleEvent (this, command_args);
                        Assert.IsTrue (selectedIndexChangedEvent, 
"selectedIndexChangedEvent-3");
                        Assert.IsTrue (itemCommandEvent, "#00");
+
+                       //
+                       // any comand
+                       //
+                       ResetEvents ();
+                       command_args = new DataListCommandEventArgs (item, null,
+                                       new CommandEventArgs ("AnyComand", 
String.Empty));
+                       dl.ItemCommand += new DataListCommandEventHandler 
(ItemCommandHandler);
+                       bool res = dl.DoBubbleEvent (this, command_args);
+                       Assert.IsTrue (res, "any comand#00");
+                       Assert.IsTrue (itemCommandEvent, "any comand#01");
                }
 
                [Test]

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

Reply via email to