[prev in list] [next in list] [prev in thread] [next in thread]
List: mono-patches
Subject: [Mono-patches] r70284 -
From: "Igor Zalmanovich (igorz () mainsoft ! com)"
Date: 2006-12-31 14:44:01
Message-ID: 20061231144401.AA0A89472C () mono-cvs ! ximian ! com
[Download RAW message or body]
Author: igorz
Date: 2006-12-31 09:44:01 -0500 (Sun, 31 Dec 2006)
New Revision: 70284
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ContainedTable.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.js
trunk/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/GridView.js
Log:
2006-12-31 Igor Zelmanovich <igorz@mainsoft.com>
* ContainedTable.cs:
* DataControlButton.cs:
* DetailsView.cs: fixed EnablePagingCallbacks
* DetailsView.js:
* GridView.cs:
* GridView.js: fixed EnableSortingAndPagingCallbacks
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog 2006-12-31 \
14:37:19 UTC (rev 70283)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog 2006-12-31 \
14:44:01 UTC (rev 70284) @@ -1,3 +1,12 @@
+2006-12-31 Igor Zelmanovich <igorz@mainsoft.com>
+
+ * ContainedTable.cs:
+ * DataControlButton.cs:
+ * DetailsView.cs: fixed EnablePagingCallbacks
+ * DetailsView.js:
+ * GridView.cs:
+ * GridView.js: fixed EnableSortingAndPagingCallbacks
+
2006-12-28 Igor Zelmanovich <igorz@mainsoft.com>
* TreeView.cs:
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ContainedTable.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ContainedTable.cs 2006-12-31 \
14:37:19 UTC (rev 70283)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ContainedTable.cs 2006-12-31 \
14:44:01 UTC (rev 70284) @@ -45,6 +45,7 @@
protected override void AddAttributesToRender (HtmlTextWriter writer) {
ControlStyle.CopyFrom (_container.ControlStyle);
+ writer.AddAttribute (HtmlTextWriterAttribute.Id, _container.ClientID);
base.AddAttributesToRender (writer);
}
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs 2006-12-31 \
14:37:19 UTC (rev 70283)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs 2006-12-31 \
14:44:01 UTC (rev 70284) @@ -115,7 +115,7 @@
else
ops = GetPostBackOptions ();
- postScript = Page.ClientScript.GetPostBackEventReference (ops, true);
+ postScript = Page.ClientScript.GetPostBackEventReference (ops, \
!Page.IsCallback);
if (AllowCallback) {
ICallbackContainer ccner = container as ICallbackContainer;
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs 2006-12-31 \
14:37:19 UTC (rev 70283)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs 2006-12-31 \
14:44:01 UTC (rev 70284) @@ -1867,18 +1867,14 @@
protected internal override void Render (HtmlTextWriter writer)
{
PrepareControlHierarchy ();
-
+
if (EnablePagingCallbacks)
- base.RenderBeginTag (writer);
- else
- writer.RenderBeginTag (HtmlTextWriterTag.Div);
+ writer.AddAttribute (HtmlTextWriterAttribute.Id, ClientID + "_div");
+ writer.RenderBeginTag (HtmlTextWriterTag.Div);
RenderGrid (writer);
-
- if (EnablePagingCallbacks)
- base.RenderEndTag (writer);
- else
- writer.RenderEndTag ();
+
+ writer.RenderEndTag ();
}
void RenderGrid (HtmlTextWriter writer)
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.js
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.js 2006-12-31 \
14:37:19 UTC (rev 70283)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.js 2006-12-31 \
14:44:01 UTC (rev 70284) @@ -8,13 +8,13 @@
function DetailsView_ClientRender (data, ctx)
{
var gridData = eval (ctx + "_data");
- var grid = document.getElementById (ctx);
+ var grid = document.getElementById (ctx + "_div");
var i = data.indexOf ("|");
gridData.pageIndex = parseInt (data.substring (0, i));
grid.innerHTML = data.substr (i+1);
-
- var page = document.getElementById(ctx + "_Page");
- page.value = gridData.pageIndex;
+
+ var page = document.getElementById(ctx + "_Page");
+ page.value = gridData.pageIndex;
}
function DetailsView_ClientRender_Error (data, ctx)
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs 2006-12-31 \
14:37:19 UTC (rev 70283)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs 2006-12-31 \
14:44:01 UTC (rev 70284) @@ -2049,7 +2049,7 @@
PrepareControlHierarchy ();
if (EnableSortingAndPagingCallbacks)
- writer.AddAttribute (HtmlTextWriterAttribute.Id, ClientID);
+ writer.AddAttribute (HtmlTextWriterAttribute.Id, ClientID + "_div");
writer.RenderBeginTag (HtmlTextWriterTag.Div);
RenderGrid (writer);
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/GridView.js
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/GridView.js 2006-12-31 \
14:37:19 UTC (rev 70283)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/GridView.js 2006-12-31 \
14:44:01 UTC (rev 70284) @@ -8,7 +8,7 @@
function GridView_ClientRender (data, ctx)
{
var gridData = eval (ctx + "_data");
- var grid = document.getElementById (ctx);
+ var grid = document.getElementById (ctx + "_div");
var i = data.indexOf ("|");
var j = data.indexOf ("|", i+1);
var k = data.indexOf ("|", j+1);
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic