From c9007a305f2de31ead84ddd613f6635fdc33f43a Mon Sep 17 00:00:00 2001
From: Carl de Billy <carl.debilly@gmail.com>
Date: Sun, 23 Feb 2014 10:01:02 -0500
Subject: [PATCH 1/4] Adjusted the result type of ajax requests

The generic result type of ajax requests were incorrect.  Now adjusted
with right values.
---
 rx.js/rx.jquery.d.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/rx.js/rx.jquery.d.ts b/rx.js/rx.jquery.d.ts
index f8513cf44..28183aa6f 100644
--- a/rx.js/rx.jquery.d.ts
+++ b/rx.js/rx.jquery.d.ts
@@ -6,12 +6,18 @@
 ///<reference path="../jquery/jquery.d.ts"/>
 ///<reference path="rx.d.ts"/>
 
+interface RxJQueryResult<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<RxJQueryResult<T>>;
+	getAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryResult<T>>;
+	getJSONAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryResult<T>>;
+	getScriptAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryResult<T>>;
+	postAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryResult<T>>;
 }
 
 interface JQuery {

From 36ab9ba2a0bf62badeac14f2b71b7ed0c1718d26 Mon Sep 17 00:00:00 2001
From: Carl de Billy <carl.debilly@gmail.com>
Date: Sun, 23 Feb 2014 10:05:19 -0500
Subject: [PATCH 2/4] Renamed RxJQueryResult to RxJQueryAjaxResult

---
 rx.js/rx.jquery.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rx.js/rx.jquery.d.ts b/rx.js/rx.jquery.d.ts
index 28183aa6f..f2dcb284a 100644
--- a/rx.js/rx.jquery.d.ts
+++ b/rx.js/rx.jquery.d.ts
@@ -6,18 +6,18 @@
 ///<reference path="../jquery/jquery.d.ts"/>
 ///<reference path="rx.d.ts"/>
 
-interface RxJQueryResult<T> {
+interface RxJQueryAjaxResult<T> {
 	data: T;
 	textStatus: string;
 	jqXHR: JQueryXHR;
 }
 
 interface JQueryStatic {
-	ajaxAsObservable<T>(settings: JQueryAjaxSettings): Rx.Observable<RxJQueryResult<T>>;
-	getAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryResult<T>>;
-	getJSONAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryResult<T>>;
-	getScriptAsObservable<T>(url: string, data: any): Rx.Observable<RxJQueryResult<T>>;
-	postAsObservable<T>(url: string, data: any, dataType: string): Rx.Observable<RxJQueryResult<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 {

From f8afb57dfec69aef8b5380442c0a144db881b862 Mon Sep 17 00:00:00 2001
From: Carl de Billy <carl.debilly@gmail.com>
Date: Sun, 23 Feb 2014 10:23:20 -0500
Subject: [PATCH 3/4] Corrected Rx.IObservable => Rx.Observable

The interface name changed in the RxJs definitions.  Corrections
reported here.
---
 knockout.rx/knockout.rx.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 @@
 /// <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>;
 	}

From 9a2a6fd4323eee5f5339ee0c422e12b1ab4ba2c5 Mon Sep 17 00:00:00 2001
From: Carl de Billy <carl.debilly@gmail.com>
Date: Sun, 23 Feb 2014 10:28:13 -0500
Subject: [PATCH 4/4] Fixed unit test too

---
 knockout.rx/knockout.rx-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
 /// <reference path="knockout.rx.d.ts"/>
 
-var ax: Rx.IObservable<number>;
+var ax: Rx.Observable<number>;
 
 var ao = ax.toKoObservable();