Author: igorz
Date: 2007-02-27 06:38:53 -0500 (Tue, 27 Feb 2007)
New Revision: 73456
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
Log:
2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
* BaseDataList.cs: fixed: data-binding flow for 2.0 features.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
2007-02-27 09:11:47 UTC (rev 73455)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
2007-02-27 11:38:53 UTC (rev 73456)
@@ -177,8 +177,7 @@
else
ViewState ["DataMember"] = value;
#if NET_2_0
- if (!Initialized)
- OnDataPropertyChanged ();
+ OnDataPropertyChanged ();
#endif
}
}
@@ -203,8 +202,7 @@
source = value;
- if (!Initialized)
- OnDataPropertyChanged ();
+ OnDataPropertyChanged ();
#else
source = value;
#endif
@@ -264,8 +262,7 @@
ViewState ["DataSourceID"] = value;
- if (!Initialized)
- OnDataPropertyChanged ();
+ OnDataPropertyChanged ();
}
}
@@ -313,11 +310,18 @@
{
// We are recreating the children from viewstate
if (HasControls ())
- Controls.Clear();
+ base.Controls.Clear();
+#if NET_2_0
+ if (IsDataBound)
+ CreateControlHierarchy (false);
+ else if (RequiresDataBinding)
+ EnsureDataBound ();
+#else
// If presents, build the children from the viewstate
if (ViewState ["Items"] != null)
CreateControlHierarchy (false);
+#endif
}
protected abstract void CreateControlHierarchy (bool
useDataSource);
@@ -342,6 +346,10 @@
// Indicate that child controls have been created,
preventing
// CreateChildControls from getting called.
ChildControlsCreated = true;
+#if NET_2_0
+ RequiresDataBinding = false;
+ IsDataBound = true;
+#endif
}
#if NET_2_0
protected virtual DataSourceSelectArguments
CreateDataSourceSelectArguments ()
@@ -373,6 +381,16 @@
dsv.Select (SelectArguments, new
DataSourceViewSelectCallback (SelectCallback));
return data;
}
+
+ bool IsDataBound {
+ get {
+ return ViewState.GetBool ("_DataBound", false);
+ }
+ set {
+ ViewState ["_DataBound"] = value;
+ }
+ }
+
#endif
protected override void OnDataBinding (EventArgs e)
@@ -382,6 +400,8 @@
#if NET_2_0
protected virtual void OnDataPropertyChanged ()
{
+ if (Initialized)
+ RequiresDataBinding = true;
}
protected virtual void OnDataSourceViewChanged (object sender,
EventArgs e)
@@ -392,18 +412,38 @@
protected internal override void OnInit (EventArgs e)
{
base.OnInit (e);
+ if (Page != null) {
+ Page.PreLoad += new EventHandler
(OnPagePreLoad);
+
+ if (!IsViewStateEnabled && Page.IsPostBack)
+ RequiresDataBinding = true;
+ }
}
-
+
+ protected virtual void OnPagePreLoad (object sender, EventArgs
e)
+ {
+ Initialize ();
+ }
+
protected internal override void OnLoad (EventArgs e)
{
- if ((Page != null) && !Page.IsPostBack)
- RequiresDataBinding = true;
+ if (!Initialized)
+ Initialize ();
+ base.OnLoad (e);
+ }
+
+ private void Initialize ()
+ {
+ if (Page != null) {
+ if (!Page.IsPostBack || (IsViewStateEnabled &&
!IsDataBound))
+ RequiresDataBinding = true;
+ }
+
if (IsBoundUsingDataSourceID)
ConnectToDataSource ();
initialized = true;
- base.OnLoad (e);
}
protected internal override void OnPreRender (EventArgs e)
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-02-27 09:11:47 UTC (rev 73455)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-02-27 11:38:53 UTC (rev 73456)
@@ -1,3 +1,7 @@
+2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * BaseDataList.cs: fixed: data-binding flow for 2.0 features.
+
2007-02-27 Marek Habersack <[EMAIL PROTECTED]>
* FileUpload.cs: HasFile is true only if PostedFile is not null
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches