2006-12-31 Igor Zelmanovich <[email protected]>

	* ContainedTable.cs:
	* DataControlButton.cs:
	* DetailsView.cs: fixed EnablePagingCallbacks
	* DetailsView.js:
	* GridView.cs:
	* GridView.js: fixed EnableSortingAndPagingCallbacks

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

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,12 @@
+2006-12-31 Igor Zelmanovich <[email protected]>
+
+	* ContainedTable.cs:
+	* DataControlButton.cs:
+	* DetailsView.cs: fixed EnablePagingCallbacks
+	* DetailsView.js:
+	* GridView.cs:
+	* GridView.js: fixed EnableSortingAndPagingCallbacks
+
 2006-12-28 Igor Zelmanovich <[email protected]>
 
 	* TreeView.cs: 

mcs/class/System.Web/System.Web.UI.WebControls/ContainedTable.cs

@@ -45,6 +45,7 @@ namespace System.Web.UI.WebControls
 		protected override void AddAttributesToRender (HtmlTextWriter writer) {
 
 			ControlStyle.CopyFrom (_container.ControlStyle);
+			writer.AddAttribute (HtmlTextWriterAttribute.Id, _container.ClientID);
 
 			base.AddAttributesToRender (writer);
 		}

mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs

@@ -115,7 +115,7 @@ namespace System.Web.UI.WebControls
 				else
 					ops = GetPostBackOptions ();
 
-				postScript = Page.ClientScript.GetPostBackEventReference (ops, true);
+				postScript = Page.ClientScript.GetPostBackEventReference (ops, !Page.IsCallback);
 				
 				if (AllowCallback) {
 					ICallbackContainer ccner = container as ICallbackContainer;

mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.cs

@@ -1867,18 +1867,14 @@ namespace System.Web.UI.WebControls
 		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)

mcs/class/System.Web/System.Web.UI.WebControls/DetailsView.js

@@ -8,13 +8,13 @@ function DetailsView_ClientEvent (ctrlId, evnt)
 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)

mcs/class/System.Web/System.Web.UI.WebControls/GridView.cs

@@ -2049,7 +2049,7 @@ namespace System.Web.UI.WebControls
 			PrepareControlHierarchy ();
 
 			if (EnableSortingAndPagingCallbacks)
-				writer.AddAttribute (HtmlTextWriterAttribute.Id, ClientID);
+				writer.AddAttribute (HtmlTextWriterAttribute.Id, ClientID + "_div");
 			writer.RenderBeginTag (HtmlTextWriterTag.Div);
 
 			RenderGrid (writer);

mcs/class/System.Web/System.Web.UI.WebControls/GridView.js

@@ -8,7 +8,7 @@ function GridView_ClientEvent (ctrlId, evnt)
 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);