Commit Graph
1169 Commits
Author SHA1 Message Date
Chris Toshok f958ab101c 2006-01-27 Chris Toshok <[email protected]>
* MasterPage.cs (ContentTemplatesInternal): add get/set for the
	actual Hashtable.

	* Page.cs (SaveExistingContentTemplates): store off the existing
	MasterPage content templates so they can be reapplied when setting
	MasterPageFile to something else.
	(ReapplyExistingContentTemplates): set masterPage's
	ContentTemplates to our saved copy.
	(set_MasterPageFile): save off the current content templates
	before clearing masterPage.
	(get_Master): reapply the saved content templates after we create
	the new MasterPage.


svn path=/trunk/mcs/; revision=56185
2006-01-27 19:36:29 +00:00
Chris Toshok 72d1f9e684 2006-01-25 Chris Toshok <[email protected]>
* ClientScriptManager.cs (RegisterClientScriptResource): last
	patch, I swear.  How can 1 line of code have 3 bugs?


svn path=/trunk/mcs/; revision=56074
2006-01-25 21:51:18 +00:00
Chris Toshok 5f31cb36ce 2006-01-25 Chris Toshok <[email protected]>
* ClientScriptManager.cs (RegisterClientScriptResource): gah, fix
	problem with last commit - unquote "resourceName" so it uses the
	parameter instead of the string constant.


svn path=/trunk/mcs/; revision=56063
2006-01-25 21:13:53 +00:00
Konstantin Triger e339aeb86e refactoring for ColorFormatter Read/Write
svn path=/trunk/mcs/; revision=56033
2006-01-25 08:32:05 +00:00
Chris Toshok ede0bd7512 2006-01-22 Chris Toshok <[email protected]>
* RootBuilder.cs (.cctor): use a 2.0 friendly hashtable ctor to
	quiet mcs.


svn path=/trunk/mcs/; revision=55924
2006-01-23 02:16:58 +00:00
Chris Toshok 99841fa9c7 2006-01-22 Chris Toshok <[email protected]>
* RootBuilder.cs (.cctor): use a 2.0 friendly hashtable ctor to
	quiet mcs.


svn path=/trunk/mcs/; revision=55917
2006-01-22 21:00:41 +00:00
Chris Toshok ef9c382df3 2006-01-22 Chris Toshok <[email protected]>
* PageParser.cs (ProcessMainAttributes): i missed a
	CONFIGURATION_2_0 block.


svn path=/trunk/mcs/; revision=55911
2006-01-22 20:05:32 +00:00
Chris Toshok bec27db5cd 2006-01-22 Chris Toshok <[email protected]>
* BoundPropertyEntry.cs (.ctor): mark as internal to fix
	corcompare.


svn path=/trunk/mcs/; revision=55909
2006-01-22 19:24:24 +00:00
Konstantin Triger caee16f7d1 preserve emptiness in ColorFormatter
svn path=/trunk/mcs/; revision=55711
2006-01-18 08:57:28 +00:00
Konstantin Triger 7c54a369df perform case insensitive compare; return correct key in default case
svn path=/trunk/mcs/; revision=55708
2006-01-18 08:38:04 +00:00
Chris Toshok ec51af0830 2006-01-11 Chris Toshok <[email protected]>
* ClientScriptManager.cs (RegisterClientScriptResource):
	implement.


svn path=/trunk/mcs/; revision=55397
2006-01-11 20:12:52 +00:00
Vladimir Krasnov 76313ccac3 * ObjectStateFormatter.cs: Removed TARGET_JVM parts in
TypeFormatter.Read

svn path=/trunk/mcs/; revision=55375
2006-01-11 15:46:36 +00:00
Chris Toshok f45c0b438d 2006-01-10 Chris Toshok <[email protected]>
* Page.cs (ValidateCollection): in NET_2_0 if event validation is
	off, return true.


svn path=/trunk/mcs/; revision=55334
2006-01-10 19:40:53 +00:00
Chris Toshok 48cd67bd7e 2006-01-09 Chris Toshok <[email protected]>
* Page.cs: fix a lot of indentation, and add the
	EnableEventValidation .net 2.0 property.


svn path=/trunk/mcs/; revision=55273
2006-01-10 00:59:31 +00:00
Vladimir Krasnov 20ac4bb294 * ObjectStateFormatter.cs: Merged TARGET_JVM parts in
TypeFormatter.Read, TypeFormatter.Write from /main/5

svn path=/trunk/mcs/; revision=55246
2006-01-09 17:34:33 +00:00
Konstantin Triger abdf921fc2 make ProcessRequest virtual under TARGET_JVM
svn path=/trunk/mcs/; revision=55232
2006-01-09 15:55:45 +00:00
Chris Toshok c0f2c8766e 2006-01-04 Chris Toshok <[email protected]>
* TemplateParser.cs (.ctor): kinda gross, but handle the
	AddAssembliesInBin case here.
	
	* SimpleWebHandlerParser.cs (.ctor): same.


svn path=/trunk/mcs/; revision=55086
2006-01-04 22:36:40 +00:00
Chris Toshok 2b27715958 2006-01-04 Chris Toshok <[email protected]>
* SimpleWebHandlerParser.cs: Remove the declaration of
	compilationConfig in the CONFIGURATION_2_0 case.  it's
	unnecessary.
	(.ctor): ifdef out the AddAssembliesInBin call in the
	CONFIGURATION_2_0 case.  need to revisit this.
	(CompilationConfig): add a CONFIGURATION_2_0 version.

	* BaseParser.cs: Remove the declaration of compilationConfig in
	the CONFIGURATION_2_0 case.  it's unnecessary.


svn path=/trunk/mcs/; revision=55045
2006-01-04 07:15:30 +00:00
Gonzalo Paniagua Javier cc5d84d39d Patch by D. Moonfire that fixes several issues with 2.0 page attributes.
svn path=/trunk/mcs/; revision=54363
2005-12-14 15:49:16 +00:00
Gonzalo Paniagua Javier fe283242da 2005-12-08 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: use _controls instead of the property wherever possible.


svn path=/trunk/mcs/; revision=54099
2005-12-08 08:17:29 +00:00
Gonzalo Paniagua Javier 1e872ff7f4 2005-12-05 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: use the _controls field instead of the Controls property.
	Fixes bug #76919.


svn path=/trunk/mcs/; revision=53954
2005-12-05 22:37:45 +00:00
Sebastien Pouliot 2b1486b90b 2005-11-30 Sebastien Pouliot <[email protected]>
* KeyedList.cs: Fixed for IOrderedDictionary change in 2.0 final.
	Now internal.
	* KeyedListEnumerator.cs: Now internal.


svn path=/trunk/mcs/; revision=53681
2005-11-30 14:36:10 +00:00
Gonzalo Paniagua Javier c785636df4 2005-11-29 Gonzalo Paniagua Javier <[email protected]>
* Test/System.Web.UI/ControlCollectionTest.cs: new tests.
	* System.Web_test.dll.sources: add new file.
	* System.Web.UI/ControlCollection.cs: allow 'null' in Remove.


svn path=/trunk/mcs/; revision=53659
2005-11-30 01:53:24 +00:00
Chris Toshok 2fd12039bd 2005-11-28 Chris Toshok <[email protected]>
* Page.cs (GetFormatter): CONFIGURATION_2_0 work.

	* TemplateParser.cs (..ctor): CONFIGURATION_2_0 work.
	(PagesConfig): add a CONFIGURATION_2_0 version that returns a
	PagesSection.

	* PageParser.cs (ProcessMainAttributes): CONFIGURATION_2_0 work.

	* BaseParser.cs (CompilationConfig): add a CONFIGURATION_2_0
	version that returns a CompilationSection.


svn path=/trunk/mcs/; revision=53582
2005-11-28 20:54:41 +00:00
Gonzalo Paniagua Javier fe46979e7d 2005-11-22 Gonzalo Paniagua Javier <[email protected]>
* SimpleWebHandlerParser.cs: removed 'codebehind' related stuff.


svn path=/trunk/mcs/; revision=53376
2005-11-23 00:31:37 +00:00
Chris Toshok e8767d99bc 2005-11-09 Chris Toshok <[email protected]>
* ViewStateEncryptionMode.cs: new 2.0 enum.


svn path=/trunk/mcs/; revision=52806
2005-11-09 23:22:51 +00:00
Gonzalo Paniagua Javier 04e7510fe0 2005-11-08 Gonzalo Paniagua Javier <[email protected]>
* TemplateParser.cs: fixes #76423. Not tested properly.


svn path=/trunk/mcs/; revision=52735
2005-11-08 21:01:08 +00:00
Gonzalo Paniagua Javier 131df90526 2005-11-07 Gonzalo Paniagua Javier <[email protected]>
* Page.cs: call LoadViewStateRecursive when the Form collection has
	not been used by a different page (GetTypeHashCode). This fixes problems
	when calling Server.Transfer while preserving Form and QueryString,
	as the page we transfer to used the view state stored in the Form, which
	contained the serialized data for the page calling Server.Transfer
	instead.


svn path=/trunk/mcs/; revision=52677
2005-11-08 02:00:34 +00:00
Gonzalo Paniagua Javier 2c9b88f315 2005-10-31 Gonzalo Paniagua Javier <[email protected]>
* System.Web/HttpContext.cs: added a new internal overload for
	ClearError.
	* System.Web.UI/Page.cs: add/remove the error before/after invoking
	OnError.

	Fixes bug #76595.


svn path=/trunk/mcs/; revision=52418
2005-10-31 19:58:01 +00:00
Gonzalo Paniagua Javier 31b1ff783d 2005-10-27 Gonzalo Paniagua Javier <[email protected]>
* Page.cs: call OnError when there's an exception (not for TAE). Fixes
	bug #76572.


svn path=/trunk/mcs/; revision=52294
2005-10-27 18:50:51 +00:00
Gonzalo Paniagua Javier c4ab92db3e 2005-10-25 Gonzalo Paniagua Javier <[email protected]>
* TemplateControl.cs:
	* PartialCachingControl.cs: if a control is cacheable, LoadControl
	returns a PartialCachingControl that holds the VaryBy* and takes care
	of partial caching and rendering. Fixes bug #76547.


svn path=/trunk/mcs/; revision=52188
2005-10-25 16:35:24 +00:00
Gonzalo Paniagua Javier c31395dc23 GetViewStateString() does not need to be internal
svn path=/trunk/mcs/; revision=52187
2005-10-25 16:27:43 +00:00
Gonzalo Paniagua Javier f9d7d1a7f7 2005-10-17 Gonzalo Paniagua Javier <[email protected]>
* System.Web.UI/Page.cs: don't cache the 'Validate()' results.
	IsValid retests the validators again.

	* System.Web.UI.WebControls/BaseDataList.cs: Type.GetTypeCode
	was fixed and now does not throw a nullref, so we have to do
	it by ourselves here to make the test happy.

	* System.Web.UI.WebControls/BaseValidator.cs: render the text of
	the error message even if we set IsValid programatically. Don't
	use 'valid' directly, as IsValid is virtual.

	Fixes bug #76299.


svn path=/trunk/mcs/; revision=51840
2005-10-17 23:58:16 +00:00
Gonzalo Paniagua Javier dfdec159d7 2005-09-29 Gonzalo Paniagua Javier <[email protected]>
* System.Web.UI/DesignerDataBoundLiteralControl.cs: changed autoid api.
	* System.Web.UI/DataBoundLiteralControl.cs: changed autoid api.

	* System.Web.UI/Control.cs: fixlet for UniqueID and weird test case.
	Removed PreventAutoID and only use the property to set that value.

	* System.Web.UI/LiteralControl.cs: changed autoid api.

	* System.Web.UI.WebControls/Button.cs: implemented 2.0
	RaisePostBackEvent in terms of the existing code in 1.1 (or viceversa).
	RenderContents() does nothing.

	* System.Web.UI.WebControls/DataGrid.cs: changed autoid api.

	* System.Web.UI.WebControls/EditCommandColumn.cs: only 'Update' causes
	validation.

	* System.Web.UI.WebControls/TableCell.cs: changed autoid api.
	RenderContents checks the number of controls to decide what to do, not
	the value of Text in the viewstate.

	* System.Web.UI.WebControls/TableRow.cs: changed autoid api.

	* System.Web.UI.WebControls/BoundColumn.cs: SelectedItem was missing
	when attaching a DataBind event. When we get an EditItem, we need a
	TextBox to be created and this one will be the one that gets the event.
	Changed ItemDataBinding to deal with a TextBox too.

	All tests pass now in the default profile (2 not run).


svn path=/trunk/mcs/; revision=51019
2005-09-30 02:22:33 +00:00
Gonzalo Paniagua Javier 285d824d6a 2005-09-28 Gonzalo Paniagua Javier <[email protected]>
* System.Web_test.dll.sources: add new test.

	* System.Web.UI/AttributeCollection.cs: avoid code duplication and
	don't add "style" to the bag, or it will overwrite the settings made
	by CssStyleCollection.

	* System.Web.UI/CssStyleCollection.cs: make it throw where MS throws.
	Minimize the number of times we create the "style" string and take
	care of updating it for the AttributeCollection. FillStyle and
	BagToString are now private. One should use the 2.0 (internal in <2.0)
	Value property.

	* System.Web.UI.WebControls/Style.cs: avoid unnecesary creation of a
	CssStyleCollection and instead write the style attributes directly to
	the HtmlTextWriter.

	* System.Web.UI.WebControls/CheckBox.cs: adapted to new API.

	* DataGrid.cs: handle null data sources. Fixed the contions that make
	the table to be added to the Controls collection.

	* System.Web.UI.WebControls/Calendar.cs: the table needed an ID and the
	attributes from the parent. Also don't create the ControlStyleCollection
	if it has not already been created.


svn path=/trunk/mcs/; revision=50931
2005-09-28 08:05:58 +00:00
Gonzalo Paniagua Javier d445bca651 2005-09-28 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: fix HasChildViewStates.


svn path=/trunk/mcs/; revision=50924
2005-09-28 05:45:04 +00:00
Gonzalo Paniagua Javier dac059418e 2005-09-27 Gonzalo Paniagua Javier <[email protected]>
* LosFormatter.cs: when the default ctor is used, MAC is disabled.
	Fixes bug #76240.


svn path=/trunk/mcs/; revision=50885
2005-09-27 19:48:42 +00:00
Gonzalo Paniagua Javier d5f384ac7e 2005-09-27 Gonzalo Paniagua Javier <[email protected]>
* ObjectTagBuilder.cs: only fail when no id and no attributes.


svn path=/trunk/mcs/; revision=50823
2005-09-27 06:48:44 +00:00
Sebastien Pouliot fcb9fa195e 2005-09-23 Sebastien Pouliot <[email protected]>
* DataBindingCollection.cs: Using an hashtable is a nice trick but
	we need to copy values (not the DictionaryEntry) in CopyTo.
	* Page.cs: IsValid throws an exception if the page hasn't be 
	validated. VerifyRenderingInServerForm doesn't throw an exception
	during unit testing (without a context?) but does in normal ops.


svn path=/trunk/mcs/; revision=50651
2005-09-23 23:32:07 +00:00
Gonzalo Paniagua Javier 070d6e9ba9 2005-09-23 Gonzalo Paniagua Javier <[email protected]>
* LosFormatter.cs: the exceptions thrown have a 500 httpCode. Really
	save the allocation of new MemoryStreams when possible. Thanks to
	Sebastien again.


svn path=/trunk/mcs/; revision=50648
2005-09-23 23:15:50 +00:00
Ben Maurer de4d2eee34 In Test/System.Web.UI:
2005-09-23  Ben Maurer  <[email protected]>

	* HtmlTextWriterTest.cs: Reenable some stuff

In System.Web.UI:
2005-09-23  Ben Maurer  <[email protected]>

	* HtmlTextWriter.cs: Initial support for escaping.


svn path=/trunk/mcs/; revision=50636
2005-09-23 22:23:33 +00:00
Gonzalo Paniagua Javier de6e5d9a8e 2005-09-23 Gonzalo Paniagua Javier <[email protected]>
* ViewStateOutputHashStream.cs: Removed. It didn't last long.

	* Page.cs: almost restored to its previous state, but now that we found
	that LosFormatter ctor that takes 'enableMac', moved the logic to
	add the hash and validate there. Thanks to Sebastien for his input.
	
	* LosFormatter.cs: implemented the missing ctors and support for
	"MAC" validation of the data.


svn path=/trunk/mcs/; revision=50634
2005-09-23 22:03:12 +00:00
Gonzalo Paniagua Javier 6780251b11 2005-09-23 Gonzalo Paniagua Javier <[email protected]>
* System.Web.UI/Page.cs:
	* System.Web.UI/ViewStateOutputHashStream.cs:
	* System.Web.dll.sources: added support for viewstate MAC. It prevents
	the viewstate being altered on the client and it's disabled by default
	as per the documentation, but MS machine.config has it enabled in
	machine.config.


svn path=/trunk/mcs/; revision=50567
2005-09-23 09:34:40 +00:00
Sebastien Pouliot 7330a12648 fix default build
svn path=/trunk/mcs/; revision=50547
2005-09-23 00:48:06 +00:00
Miguel de Icaza cbfe1dff48 Remove a number of compilation warnings.
2005-09-22  Miguel de Icaza  <[email protected]>

	* DataBindingCollection.cs: Raise the event, remove MonoTODO.

	* MinimizableAttributeTypeConverter.cs: Fix warning, compare to a
	string. 



svn path=/trunk/mcs/; revision=50544
2005-09-23 00:13:59 +00:00
Sebastien Pouliot 2a989e4587 2005-09-21 Sebastien Pouliot <[email protected]>
* Control.cs: Added null checks for Trace as it can be null when 
	rendering (like it was for 39 unit tests).


svn path=/trunk/mcs/; revision=50368
2005-09-21 12:01:37 +00:00
Gonzalo Paniagua Javier ed6bbe092b 2005-09-21 Gonzalo Paniagua Javier <[email protected]>
* System.Web/TraceContext.cs: add new method to store size of controls.
	* System.Web/TraceData.cs: render control size.
	* System.Web/HttpResponse.cs: new internal method to get the number
	of bytes of buffered output.
	* System.Web/HttpResponseStream.cs: added Length property to the Buckets
	and new GetTotalLength.
	* System.Web.UI/Page.cs: reverted hacks used with the wrong method of
	getting a control rendered size.
	* System.Web.UI/Control.cs: if the trace is enabled, save control 
	rendered size.


svn path=/trunk/mcs/; revision=50355
2005-09-21 05:09:29 +00:00
Sebastien Pouliot 52befb0ae9 2005-09-19 Sebastien Pouliot <[email protected]>
* Page.cs: Remove references to IPageParser (removed from 2.0 RC). We
	now use HtmlHeader directly.
	* UrlPropertyAttribute.cs: Removed AllowedTypes property (2.0 RC) and
	rewrote Equals to avoid dual type cast.


svn path=/trunk/mcs/; revision=50247
2005-09-19 18:07:12 +00:00
Sebastien Pouliot 43529e8ac0 2005-09-19 Sebastien Pouliot <[email protected]>
* SupportsEventValidationAttribute.cs: New attribute added in 2.0 RC.


svn path=/trunk/mcs/; revision=50237
2005-09-19 15:19:57 +00:00
Sebastien Pouliot 7836b64c9d 2005-09-19 Sebastien Pouliot <[email protected]>
* ControlBuilder.cs: Added BuildObject override for 2.0 profile.
	* TagPrefixAttribute.cs: Added LinkDemand for AspNetHostingPermission
	with Minimal level. Fixed checks on ctor.
	* TemplateBuilder.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level.
	* TemplateContainerAttribute.cs: Added LinkDemand for 
	AspNetHostingPermission with Minimal level.
	* TemplateControl.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level. Fixed checks/exceptions. 
	Stubbed IFilterResolutionService for CAS testing.
	* TemplateControlParser.cs: Added LinkDemand and InheritanceDemand for
	AspNetHostingPermission with Minimal level.
	* TemplateParser.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level.
	* ThemeableAttribute.cs: Added LinkDemand for AspNetHostingPermission
	with Minimal level. Removed IDispose interface.
	* ToolboxDataAttribute.cs: Added LinkDemand for 
	AspNetHostingPermission with Minimal level. Fixed IsDefaultAttribute 
	to work on both 1.x and 2.0 profiles.
	* Triplet.cs: Added LinkDemand and (only for 1.x) InheritanceDemand 
	for AspNetHostingPermission with Minimal level.
	* UserControl.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level. Stubbed 
	IFilterResolutionService for CAS testing.
	* UserControlControlBuilder.cs: Added LinkDemand and InheritanceDemand
	for AspNetHostingPermission with Minimal level.
	* ValidationPropertyAttribute.cs: Added LinkDemand for 
	AspNetHostingPermission with Minimal level.
	* ValidatorCollection.cs: Added LinkDemand for AspNetHostingPermission 
	with Minimal level.
	* WebResourceAttribute.cs: Removed extra ctor and added setter to 
	PerformSubstitution.
	* WebServiceParser.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level.


svn path=/trunk/mcs/; revision=50230
2005-09-19 13:55:35 +00:00