Author: igorz
Date: 2007-03-01 09:56:37 -0500 (Thu, 01 Mar 2007)
New Revision: 73591
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
Log:
2007-03-01 Igor Zelmanovich <[EMAIL PROTECTED]>
* Repeater.cs: fixed: data-binding flow for 2.0 features.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-03-01 14:38:08 UTC (rev 73590)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-03-01 14:56:37 UTC (rev 73591)
@@ -1,5 +1,9 @@
2007-03-01 Igor Zelmanovich <[EMAIL PROTECTED]>
+ * Repeater.cs: fixed: data-binding flow for 2.0 features.
+
+2007-03-01 Igor Zelmanovich <[EMAIL PROTECTED]>
+
* Parameter.cs:
* ParameterCollection.cs:
fixed GetValue/s and UpdateValue/s.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
2007-03-01 14:38:08 UTC (rev 73590)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
2007-03-01 14:56:37 UTC (rev 73591)
@@ -533,38 +533,38 @@
protected internal override void OnInit (EventArgs e)
{
base.OnInit (e);
- Page.PreLoad += new EventHandler (OnPagePreLoad);
+ if (Page != null) {
+ Page.PreLoad += new EventHandler
(OnPagePreLoad);
- if (!IsViewStateEnabled && Page != null &&
Page.IsPostBack)
- RequiresDataBinding = true;
+ if (!IsViewStateEnabled && Page.IsPostBack)
+ RequiresDataBinding = true;
+ }
}
protected virtual void OnPagePreLoad (object sender, EventArgs
e)
{
- ConfirmInitState ();
+ Initialize ();
}
- void ConfirmInitState ()
- {
- initialized = true;
- }
-
protected internal override void OnLoad (EventArgs e)
{
- Initialize ();
+ if (!Initialized)
+ Initialize ();
- ConfirmInitState ();
-
base.OnLoad (e);
-
- if (IsBoundUsingDataSourceID)
- ConnectToDataSource ();
}
private void Initialize ()
{
- if ((Page != null) && !Page.IsPostBack)
- RequiresDataBinding = true;
+ if (Page != null) {
+ if (!Page.IsPostBack || (IsViewStateEnabled &&
(ViewState ["Items"] == null)))
+ RequiresDataBinding = true;
+ }
+
+ if (IsBoundUsingDataSourceID)
+ ConnectToDataSource ();
+
+ initialized = true;
}
protected internal override void OnPreRender (EventArgs e)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
