From 8d27cef4b0a2bfefd4d0d960cbf809d76c8d8849 Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru>
Date: Fri, 6 Mar 2015 00:49:46 +0900
Subject: [PATCH 1/5] Fix type mismatch

---
 jquery/jquery.d.ts | 55 ++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index b827111201..203180150e 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -283,12 +283,12 @@ interface JQueryGenericPromise<T> {
  * Interface for the JQuery promise/deferred callbacks
  */
 interface JQueryPromiseCallback<T> {
-    (value?: T, ...args: any[]): void;
+    (value?: T, ...args: T[]): void;
 }
 
-interface JQueryPromiseOperator<T, R> {
-    (callback: JQueryPromiseCallback<T>, ...callbacks: JQueryPromiseCallback<T>[]): JQueryPromise<R>;
-    (callback: JQueryPromiseCallback<T>[], ...callbacks: JQueryPromiseCallback<T>[]): JQueryPromise<R>;
+interface JQueryPromiseOperator<T, U> {
+    (callback1: JQueryPromiseCallback<T>, ...callbackN: JQueryPromiseCallback<T>[]): JQueryPromise<U>;
+    (callbacks1: JQueryPromiseCallback<T>[], ...callbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<U>;
 }
 
 /**
@@ -301,28 +301,31 @@ interface JQueryPromise<T> {
      * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
      * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
      */
-    always: JQueryPromiseOperator<any, T>;
+    always(alwaysCallback1?: JQueryPromiseCallback<T>, ...alwaysCallbackN: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
+    always(alwaysCallbacks1?: JQueryPromiseCallback<T>[], ...alwaysCallbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object is resolved.
      * 
      * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
      * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
      */
-    done: JQueryPromiseOperator<T, T>;
+    done(doneCallback1?: JQueryPromiseCallback<T>, ...doneCallbackN: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
+    done(doneCallbacks1?: JQueryPromiseCallback<T>[], ...doneCallbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object is rejected.
      * 
      * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
      * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
      */
-    fail: JQueryPromiseOperator<any, T>;
+    fail(failCallback1?: JQueryPromiseCallback<T>, ...failCallbackN: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
+    fail(failCallbacks1?: JQueryPromiseCallback<T>[], ...failCallbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object generates progress notifications.
      * 
      * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
      */
-    progress(progressCallback: JQueryPromiseCallback<T>): JQueryPromise<T>;
-    progress(progressCallbacks: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
+    progress(progressCallback1?: JQueryPromiseCallback<T>, ...progressCallbackN: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
+    progress(progressCallback1s?: JQueryPromiseCallback<T>[], ...progressCallbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<T>;
 
     /**
      * Determine the current state of a Deferred object.
@@ -362,44 +365,38 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
      * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
      */
-    always(alwaysCallbacks1?: JQueryPromiseCallback<T>, ...alwaysCallbacks2: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    always(alwaysCallbacks1?: JQueryPromiseCallback<T>[], ...alwaysCallbacks2: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    always(alwaysCallbacks1?: JQueryPromiseCallback<T>, ...alwaysCallbacks2: any[]): JQueryDeferred<T>;
-    always(alwaysCallbacks1?: JQueryPromiseCallback<T>[], ...alwaysCallbacks2: any[]): JQueryDeferred<T>;
+    always(alwaysCallback1?: JQueryPromiseCallback<T>, ...alwaysCallbackN: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
+    always(alwaysCallbacks1?: JQueryPromiseCallback<T>[], ...alwaysCallbacksN: JQueryPromiseCallback<T>[][]): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object is resolved.
      * 
      * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
      * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
      */
-    done(doneCallbacks1?: JQueryPromiseCallback<T>, ...doneCallbacks2: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    done(doneCallbacks1?: JQueryPromiseCallback<T>[], ...doneCallbacks2: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    done(doneCallbacks1?: JQueryPromiseCallback<T>, ...doneCallbacks2: any[]): JQueryDeferred<T>;
-    done(doneCallbacks1?: JQueryPromiseCallback<T>[], ...doneCallbacks2: any[]): JQueryDeferred<T>;
+    done(doneCallback1?: JQueryPromiseCallback<T>, ...doneCallbackN: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
+    done(doneCallbacks1?: JQueryPromiseCallback<T>[], ...doneCallbacksN: JQueryPromiseCallback<T>[][]): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object is rejected.
      * 
      * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
      * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
      */
-    fail(failCallbacks1?: JQueryPromiseCallback<T>, ...failCallbacks2: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    fail(failCallbacks1?: JQueryPromiseCallback<T>[], ...failCallbacks2: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    fail(failCallbacks1?: JQueryPromiseCallback<T>, ...failCallbacks2: any[]): JQueryDeferred<T>;
-    fail(failCallbacks1?: JQueryPromiseCallback<T>[], ...failCallbacks2: any[]): JQueryDeferred<T>;
+    fail(failCallback1?: JQueryPromiseCallback<T>, ...failCallbackN: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
+    fail(failCallbacks1?: JQueryPromiseCallback<T>[], ...failCallbacksN: JQueryPromiseCallback<T>[][]): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object generates progress notifications.
      * 
      * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
      */
-    progress(progressCallback: JQueryPromiseCallback<T>): JQueryDeferred<T>;
-    progress(progressCallbacks: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
+    progress(progressCallback1?: JQueryPromiseCallback<T>, ...progressCallbackN: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
+    progress(progressCallbacks1?: JQueryPromiseCallback<T>[], ...progressCallbacksN: JQueryPromiseCallback<T>[][]): JQueryDeferred<T>;
 
     /**
      * Call the progressCallbacks on a Deferred object with the given args.
      * 
      * @param args Optional arguments that are passed to the progressCallbacks.
      */
-    notify(...args: any[]): JQueryDeferred<T>;
+    notify(...args: T[]): JQueryDeferred<T>;
 
     /**
      * Call the progressCallbacks on a Deferred object with the given context and args.
@@ -407,21 +404,21 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param context Context passed to the progressCallbacks as the this object.
      * @param args Optional arguments that are passed to the progressCallbacks.
      */
-    notifyWith(context: any, ...args: any[]): JQueryDeferred<T>;
+    notifyWith(context: any, ...args: T[]): JQueryDeferred<T>;
 
     /**
      * Reject a Deferred object and call any failCallbacks with the given args.
      * 
      * @param args Optional arguments that are passed to the failCallbacks.
      */
-    reject(...args: any[]): JQueryDeferred<T>;
+    reject(...args: T[]): JQueryDeferred<T>;
     /**
      * Reject a Deferred object and call any failCallbacks with the given context and args.
      * 
      * @param context Context passed to the failCallbacks as the this object.
      * @param args An optional array of arguments that are passed to the failCallbacks.
      */
-    rejectWith(context: any, ...args: any[]): JQueryDeferred<T>;
+    rejectWith(context: any, ...args: T[]): JQueryDeferred<T>;
 
     /**
      * Resolve a Deferred object and call any doneCallbacks with the given args.
@@ -429,7 +426,7 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param value First argument passed to doneCallbacks.
      * @param args Optional subsequent arguments that are passed to the doneCallbacks.
      */
-    resolve(value?: T, ...args: any[]): JQueryDeferred<T>;
+    resolve(value?: T, ...args: T[]): JQueryDeferred<T>;
 
     /**
      * Resolve a Deferred object and call any doneCallbacks with the given context and args.
@@ -437,7 +434,7 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param context Context passed to the doneCallbacks as the this object.
      * @param args An optional array of arguments that are passed to the doneCallbacks.
      */
-    resolveWith(context: any, ...args: any[]): JQueryDeferred<T>;
+    resolveWith(context: any, ...args: T[]): JQueryDeferred<T>;
 
     /**
      * Return a Deferred's Promise object.

From ebcec4e3d950fd87a222317e6ad4a80766f4e3e1 Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru>
Date: Fri, 6 Mar 2015 22:24:22 +0900
Subject: [PATCH 2/5] Fix error

---
 jquery/jquery.d.ts | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index 203180150e..b2ae6a7559 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -283,12 +283,11 @@ interface JQueryGenericPromise<T> {
  * Interface for the JQuery promise/deferred callbacks
  */
 interface JQueryPromiseCallback<T> {
-    (value?: T, ...args: T[]): void;
+    (value?: T, ...args: any[]): void;
 }
 
 interface JQueryPromiseOperator<T, U> {
-    (callback1: JQueryPromiseCallback<T>, ...callbackN: JQueryPromiseCallback<T>[]): JQueryPromise<U>;
-    (callbacks1: JQueryPromiseCallback<T>[], ...callbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<U>;
+    (callback1: JQueryPromiseCallback<T>|JQueryPromiseCallback<any>[], ...callbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<U>;
 }
 
 /**
@@ -301,31 +300,27 @@ interface JQueryPromise<T> {
      * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
      * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
      */
-    always(alwaysCallback1?: JQueryPromiseCallback<T>, ...alwaysCallbackN: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
-    always(alwaysCallbacks1?: JQueryPromiseCallback<T>[], ...alwaysCallbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<T>;
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object is resolved.
      * 
      * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
      * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
      */
-    done(doneCallback1?: JQueryPromiseCallback<T>, ...doneCallbackN: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
-    done(doneCallbacks1?: JQueryPromiseCallback<T>[], ...doneCallbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<T>;
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object is rejected.
      * 
      * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
      * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
      */
-    fail(failCallback1?: JQueryPromiseCallback<T>, ...failCallbackN: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
-    fail(failCallbacks1?: JQueryPromiseCallback<T>[], ...failCallbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<T>;
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object generates progress notifications.
      * 
      * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
      */
-    progress(progressCallback1?: JQueryPromiseCallback<T>, ...progressCallbackN: JQueryPromiseCallback<T>[]): JQueryPromise<T>;
-    progress(progressCallback1s?: JQueryPromiseCallback<T>[], ...progressCallbacksN: JQueryPromiseCallback<T>[][]): JQueryPromise<T>;
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
 
     /**
      * Determine the current state of a Deferred object.
@@ -365,38 +360,34 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
      * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
      */
-    always(alwaysCallback1?: JQueryPromiseCallback<T>, ...alwaysCallbackN: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    always(alwaysCallbacks1?: JQueryPromiseCallback<T>[], ...alwaysCallbacksN: JQueryPromiseCallback<T>[][]): JQueryDeferred<T>;
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object is resolved.
      * 
      * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
      * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
      */
-    done(doneCallback1?: JQueryPromiseCallback<T>, ...doneCallbackN: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    done(doneCallbacks1?: JQueryPromiseCallback<T>[], ...doneCallbacksN: JQueryPromiseCallback<T>[][]): JQueryDeferred<T>;
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object is rejected.
      * 
      * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
      * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
      */
-    fail(failCallback1?: JQueryPromiseCallback<T>, ...failCallbackN: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    fail(failCallbacks1?: JQueryPromiseCallback<T>[], ...failCallbacksN: JQueryPromiseCallback<T>[][]): JQueryDeferred<T>;
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
     /**
      * Add handlers to be called when the Deferred object generates progress notifications.
      * 
      * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
      */
-    progress(progressCallback1?: JQueryPromiseCallback<T>, ...progressCallbackN: JQueryPromiseCallback<T>[]): JQueryDeferred<T>;
-    progress(progressCallbacks1?: JQueryPromiseCallback<T>[], ...progressCallbacksN: JQueryPromiseCallback<T>[][]): JQueryDeferred<T>;
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
 
     /**
      * Call the progressCallbacks on a Deferred object with the given args.
      * 
      * @param args Optional arguments that are passed to the progressCallbacks.
      */
-    notify(...args: T[]): JQueryDeferred<T>;
+    notify(value?: any, ...args: any[]): JQueryDeferred<T>;
 
     /**
      * Call the progressCallbacks on a Deferred object with the given context and args.
@@ -404,21 +395,21 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param context Context passed to the progressCallbacks as the this object.
      * @param args Optional arguments that are passed to the progressCallbacks.
      */
-    notifyWith(context: any, ...args: T[]): JQueryDeferred<T>;
+    notifyWith(context: any, value?: any, ...args: any[]): JQueryDeferred<T>;
 
     /**
      * Reject a Deferred object and call any failCallbacks with the given args.
      * 
      * @param args Optional arguments that are passed to the failCallbacks.
      */
-    reject(...args: T[]): JQueryDeferred<T>;
+    reject(value?: any, ...args: any[]): JQueryDeferred<T>;
     /**
      * Reject a Deferred object and call any failCallbacks with the given context and args.
      * 
      * @param context Context passed to the failCallbacks as the this object.
      * @param args An optional array of arguments that are passed to the failCallbacks.
      */
-    rejectWith(context: any, ...args: T[]): JQueryDeferred<T>;
+    rejectWith(context: any, value?: any, ...args: any[]): JQueryDeferred<T>;
 
     /**
      * Resolve a Deferred object and call any doneCallbacks with the given args.
@@ -426,7 +417,7 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param value First argument passed to doneCallbacks.
      * @param args Optional subsequent arguments that are passed to the doneCallbacks.
      */
-    resolve(value?: T, ...args: T[]): JQueryDeferred<T>;
+    resolve(value?: T, ...args: any[]): JQueryDeferred<T>;
 
     /**
      * Resolve a Deferred object and call any doneCallbacks with the given context and args.
@@ -434,7 +425,7 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param context Context passed to the doneCallbacks as the this object.
      * @param args An optional array of arguments that are passed to the doneCallbacks.
      */
-    resolveWith(context: any, ...args: T[]): JQueryDeferred<T>;
+    resolveWith(context: any, value?: T, ...args: any[]): JQueryDeferred<T>;
 
     /**
      * Return a Deferred's Promise object.

From 4d201887009584cd1a7c27c47dd2d6058d5d786e Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru>
Date: Fri, 6 Mar 2015 22:29:38 +0900
Subject: [PATCH 3/5] Fix return type

---
 jquery/jquery.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index b2ae6a7559..fd7ba70c9e 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -360,27 +360,27 @@ interface JQueryDeferred<T> extends JQueryPromise<T> {
      * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
      * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
      */
-    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object is resolved.
      * 
      * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
      * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
      */
-    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object is rejected.
      * 
      * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
      * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
      */
-    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object generates progress notifications.
      * 
      * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
      */
-    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
 
     /**
      * Call the progressCallbacks on a Deferred object with the given args.

From d7dcca44c67070f4e6f699d4d555a7ae51715417 Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru>
Date: Fri, 6 Mar 2015 22:37:21 +0900
Subject: [PATCH 4/5] Fix generic type

---
 jquery/jquery.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index fd7ba70c9e..e29b1046f1 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -287,7 +287,7 @@ interface JQueryPromiseCallback<T> {
 }
 
 interface JQueryPromiseOperator<T, U> {
-    (callback1: JQueryPromiseCallback<T>|JQueryPromiseCallback<any>[], ...callbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<U>;
+    (callback1: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...callbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<U>;
 }
 
 /**

From eba07e99412c054cca903a159817bc932bc60989 Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru>
Date: Fri, 6 Mar 2015 23:49:30 +0900
Subject: [PATCH 5/5] Fix definition

---
 jquery/jquery.d.ts | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index e29b1046f1..8ddc072b08 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -300,27 +300,27 @@ interface JQueryPromise<T> {
      * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
      * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
      */
-    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object is resolved.
      * 
      * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
      * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
      */
-    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryPromise<T>;
+    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object is rejected.
      * 
      * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
      * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
      */
-    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
     /**
      * Add handlers to be called when the Deferred object generates progress notifications.
      * 
      * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
      */
-    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryPromise<T>;
+    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
 
     /**
      * Determine the current state of a Deferred object.
@@ -354,34 +354,6 @@ interface JQueryPromise<T> {
  * Interface for the JQuery deferred, part of callbacks
  */
 interface JQueryDeferred<T> extends JQueryPromise<T> {
-    /**
-     * Add handlers to be called when the Deferred object is either resolved or rejected.
-     * 
-     * @param alwaysCallbacks1 A function, or array of functions, that is called when the Deferred is resolved or rejected.
-     * @param alwaysCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-     */
-    always(alwaysCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...alwaysCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object is resolved.
-     * 
-     * @param doneCallbacks1 A function, or array of functions, that are called when the Deferred is resolved.
-     * @param doneCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-     */
-    done(doneCallback1?: JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[], ...doneCallbackN: Array<JQueryPromiseCallback<T>|JQueryPromiseCallback<T>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object is rejected.
-     * 
-     * @param failCallbacks1 A function, or array of functions, that are called when the Deferred is rejected.
-     * @param failCallbacks2 Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-     */
-    fail(failCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...failCallbacksN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-    /**
-     * Add handlers to be called when the Deferred object generates progress notifications.
-     * 
-     * @param progressCallbacks A function, or array of functions, to be called when the Deferred generates progress notifications.
-     */
-    progress(progressCallback1?: JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[], ...progressCallbackN: Array<JQueryPromiseCallback<any>|JQueryPromiseCallback<any>[]>): JQueryDeferred<T>;
-
     /**
      * Call the progressCallbacks on a Deferred object with the given args.
      *