From c92d26b6159d054dcf781d1983757171d58ae0aa Mon Sep 17 00:00:00 2001 From: Patrick Magee Date: Wed, 28 May 2014 14:17:51 +0100 Subject: [PATCH] Added PageRequestManager Tests and EndRequestEventArgs Tests Minor changes to PageRequestManager definitions and Browser --- microsoft-ajax/microsoft.ajax-tests.ts | 46 ++++++++++++++++++++++++-- microsoft-ajax/microsoft.ajax.d.ts | 8 ++--- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/microsoft-ajax/microsoft.ajax-tests.ts b/microsoft-ajax/microsoft.ajax-tests.ts index 749af378e..9b70bc134 100644 --- a/microsoft-ajax/microsoft.ajax-tests.ts +++ b/microsoft-ajax/microsoft.ajax-tests.ts @@ -195,6 +195,7 @@ function Sys_Application_Tests() { Sys.Application.findComponent(id, element); Sys.Application.findComponent(id, component); Sys.Application.findComponent(id); + $find(id, element); var componentArray = Sys.Application.getComponents(); @@ -496,14 +497,14 @@ function Sys_Services_Profile_Service_Group_Tests() { } -function Sys_Net_NetworkRequestEventArgsTests() { +function Sys_Net_NetworkRequestEventArgs_Tests() { var value = new Sys.Net.WebRequest(); var netWorkEventArgs = new Sys.Net.NetWorkRequestEventArgs(value); var webRequest = netWorkEventArgs.get_webRequest(); } -function Sys_Net_WebRequestManagerTests() { +function Sys_Net_WebRequestManager_Tests() { var handler = (sender: any, args: any) => { } @@ -516,6 +517,47 @@ function Sys_Net_WebRequestManagerTests() { } +function Sys_WebForms_PageRequestManager_Tests() { + + var pageRequestManager = Sys.WebForms.PageRequestManager.getInstance(); + + var eventArgs = pageRequestManager.Empty; + + var handler = (sender: any, args: any) => { } + + var isInAsyncPostBack = pageRequestManager.get_isInAsyncPostBack(); + + pageRequestManager.add_beginRequest(handler); + pageRequestManager.add_endRequest(handler); + pageRequestManager.add_initializeRequest(handler); + pageRequestManager.add_pageLoading(handler); + pageRequestManager.add_pageLoaded(handler); + pageRequestManager.remove_beginRequest(handler); + pageRequestManager.remove_pageLoaded(handler); + pageRequestManager.remove_pageLoading(handler); + pageRequestManager.beginAsyncPostBack(); + pageRequestManager.abortPostBack(); + pageRequestManager.dispose(); +} + +function Sys_WebForms_EndRequestEventArgs_Tests() { + + var pageRequestManager = Sys.WebForms.PageRequestManager.getInstance(); + + var handler = (sender: any, args: Sys.WebForms.EndRequestEventArgs) => { + + var error = args.get_error(); + var response = args.get_response(); + var dataItems = args.get_dataItems(); + var eventArgs = args.Empty; + + args.set_errorHandled(true); + var errorHandled = args.get_errorHandled(); + } + + pageRequestManager.add_endRequest(handler); +} + function AspNetTypes_Tests() { Type.registerNamespace("Samples"); diff --git a/microsoft-ajax/microsoft.ajax.d.ts b/microsoft-ajax/microsoft.ajax.d.ts index 527e4414a..5dda0ae6c 100644 --- a/microsoft-ajax/microsoft.ajax.d.ts +++ b/microsoft-ajax/microsoft.ajax.d.ts @@ -1135,7 +1135,7 @@ declare module Sys { * The Sys.Browser object determines which browser is being used and provides some information about it. You can use this object to help customize your code to the unique requirements or capabilities of the browser. * @see {@link http://msdn.microsoft.com/en-us/library/cc679064(v=vs.100).aspx} */ - interface IBrowser { + interface Browser { //#region Fields @@ -1171,7 +1171,7 @@ declare module Sys { //#endregion } - export function Browser(): Sys.IBrowser; + export function Browser(): Sys.Browser; /** * Provides the base class for the Control and Behavior classes, and for any other object whose lifetime should be managed by the ASP.NET AJAX client library. @@ -3652,13 +3652,13 @@ declare module Sys { * @param endRequestHandler * The name of the handler method that will be called. */ - add_endRequest(endRequestHandler: (sender: any, args: any) => void): void; + add_endRequest(endRequestHandler: (sender: any, args: Sys.WebForms.EndRequestEventArgs) => void): void; /** * Raised after an asynchronous postback is finished and control has been returned to the browser. * @param endRequestHandler * The name of the handler method that will be removed. */ - remove_endRequest(endRequestHandler: (sender: any, args: any) => void): void; + remove_endRequest(endRequestHandler: (sender: any, args: Sys.WebForms.EndRequestEventArgs) => void): void; /** * Raised during the initialization of the asynchronous postback. * @param initializeRequestHandler