Fix type mismatch

2026-04-01 12:42:58 +08:00 · 2015-03-06 00:49:46 +09:00
parent 69bdfb0884
commit 8d27cef4b0
1 changed files with 26 additions and 29 deletions
--- 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.