diff --git a/knockout.rx/knockout.rx-tests.ts b/knockout.rx/knockout.rx-tests.ts index 674e9bb6a..21a0a5248 100644 --- a/knockout.rx/knockout.rx-tests.ts +++ b/knockout.rx/knockout.rx-tests.ts @@ -1,6 +1,6 @@ /// -var ax: Rx.IObservable; +var ax: Rx.Observable; var ao = ax.toKoObservable(); diff --git a/knockout.rx/knockout.rx.d.ts b/knockout.rx/knockout.rx.d.ts index 2822b12f4..f897bc761 100644 --- a/knockout.rx/knockout.rx.d.ts +++ b/knockout.rx/knockout.rx.d.ts @@ -7,20 +7,20 @@ /// interface KnockoutSubscribableFunctions { - toObservable(event?: string): Rx.IObservable; - toObservable(event: string): Rx.IObservable; + toObservable(event?: string): Rx.Observable; + toObservable(event: string): Rx.Observable; } interface KnockoutObservableFunctions { - toObservableWithReplyLatest(): Rx.IObservable; + toObservableWithReplyLatest(): Rx.Observable; } interface KnockoutComputedFunctions { - toObservableWithReplyLatest(): Rx.IObservable; + toObservableWithReplyLatest(): Rx.Observable; } declare module Rx { - interface IObservable { + interface Observable { toKoSubscribable(): KnockoutSubscribable; toKoObservable(initialValue?: T): KnockoutObservable; } diff --git a/rx.js/rx.jquery.d.ts b/rx.js/rx.jquery.d.ts index f8513cf44..f2dcb284a 100644 --- a/rx.js/rx.jquery.d.ts +++ b/rx.js/rx.jquery.d.ts @@ -6,12 +6,18 @@ /// /// +interface RxJQueryAjaxResult { + data: T; + textStatus: string; + jqXHR: JQueryXHR; +} + interface JQueryStatic { - ajaxAsObservable(settings: JQueryAjaxSettings): Rx.Observable; - getAsObservable(url: string, data: any, dataType: string): Rx.Observable; - getJSONAsObservable(url: string, data: any): Rx.Observable; - getScriptAsObservable(url: string, data: any): Rx.Observable; - postAsObservable(url: string, data: any, dataType: string): Rx.Observable; + ajaxAsObservable(settings: JQueryAjaxSettings): Rx.Observable>; + getAsObservable(url: string, data: any, dataType: string): Rx.Observable>; + getJSONAsObservable(url: string, data: any): Rx.Observable>; + getScriptAsObservable(url: string, data: any): Rx.Observable>; + postAsObservable(url: string, data: any, dataType: string): Rx.Observable>; } interface JQuery {