From c00279d3d33025fcf0c593d04a2a1f6e788d48e1 Mon Sep 17 00:00:00 2001 From: Boris Yankov Date: Tue, 13 Nov 2012 16:31:39 +0200 Subject: [PATCH] Fix SignalR declarations and files --- Definitions/signalr-1.0.d.ts | 19 ++++++++----------- Tests/signalr-tests.ts | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Definitions/signalr-1.0.d.ts b/Definitions/signalr-1.0.d.ts index e076cad8d..3deb84a43 100644 --- a/Definitions/signalr-1.0.d.ts +++ b/Definitions/signalr-1.0.d.ts @@ -23,13 +23,13 @@ interface SignalREvents { interface SignalR { events: SignalREvents; - connectionState: any; // ??? + connectionState: any; transports: any; hub: HubConnection; - id: string; // ??? + id: string; logging: bool; - messageId: string; // ??? + messageId: string; url: string; (url: string, queryString?: any, logging?: bool): SignalR; @@ -40,12 +40,12 @@ interface SignalR { changeState(connection: SignalR, expectedState: number, newState: number): bool; isDisconnecting(connection: SignalR): bool; - createHubProxy(hubName: string): SignalR; + // createHubProxy(hubName: string): SignalR; - start(): SignalR; - start(callback: () => void ): SignalR; - start(settings: ConnectionSettings): SignalR; - start(settings: ConnectionSettings, callback: () => void ): SignalR; + start(): JQueryPromise; + start(callback: () => void ): JQueryPromise; + start(settings: ConnectionSettings): JQueryPromise; + start(settings: ConnectionSettings, callback: () => void ): JQueryPromise; send(data: string): void; @@ -59,9 +59,6 @@ interface SignalR { connectionSlow(handler: () => void ): SignalR; sending(handler: () => void ): SignalR; reconnected(handler: () => void ): SignalR; - - done(handler: () => void ): SignalR; - fail(handler: () => void ): SignalR; } interface HubProxy { diff --git a/Tests/signalr-tests.ts b/Tests/signalr-tests.ts index 1d909170e..4dda69f92 100644 --- a/Tests/signalr-tests.ts +++ b/Tests/signalr-tests.ts @@ -50,6 +50,16 @@ function test_connection() { }); } +interface MyHubConnection extends HubConnection { + someState: string; + SomeFunction: Function; +} + +interface SignalR { + chat: HubConnection; + myHub: MyHubConnection; +} + function test_hubs() { var chat = $.connection.chat; chat.client.addMessage = function (message) { @@ -69,7 +79,7 @@ function test_hubs() { function connectionReady() { alert("Done calling first hub serverside-function"); }; - myHub.SomeClientFunction = function () { + myHub.SomeFunction = function () { alert("serverside called 'Clients.SomeClientFunction()'"); }; $.connection.hub.error(function () { @@ -77,7 +87,7 @@ function test_hubs() { }); $.connection.hub.start() .done(function () { - myHub.SomeFunction(SomeParam) + myHub.SomeFunction("whatever") .done(connectionReady); }) .fail(function () {