wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1723 from carldebilly/master

Browse Source 
Adjusted Rx-JQuery and Rx-Knockout signatures
This commit is contained in:
Igorbek
2014-02-23 23:21:43 -08:00
parent 35e573697c 9a2a6fd432
commit 0243d567ed
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
knockout.rx/knockout.rx-tests.ts
+1 -1
View File
@@ -1,6 +1,6 @@
/// <reference path="knockout.rx.d.ts"/>
var ax: Rx.IObservable<number>;
var ax: Rx.Observable<number>;
var ao = ax.toKoObservable();
knockout.rx/knockout.rx.d.ts
Vendored
+5 -5
View File
@@ -7,20 +7,20 @@
/// <reference path="../rx.js/rx.d.ts"/>
interface KnockoutSubscribableFunctions<T> {
toObservable(event?: string): Rx.IObservable<T>;
toObservable<TEvent>(event: string): Rx.IObservable<TEvent>;
toObservable(event?: string): Rx.Observable<T>;
toObservable<TEvent>(event: string): Rx.Observable<TEvent>;
}
interface KnockoutObservableFunctions<T> {
toObservableWithReplyLatest(): Rx.IObservable<T>;
toObservableWithReplyLatest(): Rx.Observable<T>;
}
interface KnockoutComputedFunctions<T> {
toObservableWithReplyLatest(): Rx.IObservable<T>;
toObservableWithReplyLatest(): Rx.Observable<T>;
}
declare module Rx {
interface IObservable<T> {
interface Observable<T> {
toKoSubscribable(): KnockoutSubscribable<T>;
toKoObservable(initialValue?: T): KnockoutObservable<T>;
}
rx.js/rx.jquery.d.ts
Vendored
+11 -5
View File
@@ -6,12 +6,18 @@
///<reference path="../jquery/jquery.d.ts"/>
///<reference path="rx.d.ts"/>
interface RxJQueryAjaxResult<T> {
data: T;
textStatus: string;
jqXHR: JQueryXHR;
}
interface JQueryStatic {
ajaxAsObservable<T>(settings: JQueryAjaxSettings): Rx.Observable<T>;
getAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<T>;
getJSONAsObservable<T>(url: string, data: any): Rx.Observable<T>;
getScriptAsObservable<T>(url: string, data: any): Rx.Observable<T>;
postAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<T>;
ajaxAsObservable<T>(settings: JQueryAjaxSettings): Rx.Observable<RxJQueryAjaxResult<T>>;
getAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryAjaxResult<T>>;
getJSONAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryAjaxResult<T>>;
getScriptAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryAjaxResult<T>>;
postAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryAjaxResult<T>>;
}
interface JQuery {