vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-07-03 08:40:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #445 from Diullei/master

Browse Source 
resolved conflicts to pullrequest #387
This commit is contained in:
Diullei Gomes
2013-03-31 08:16:31 -07:00
parent 3a50298a0f b8f2a0df2c
commit d2cee47caf
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jquery/jquery.d.ts vendored
View File

@@ -89,6 +89,7 @@ interface JQueryPromise {
state(): string;
pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise;
then(doneCallbacks: any, failCallbacks?: any, progressCallbacks?: any): JQueryPromise;
promise(target?): JQueryPromise;
}
/*
@@ -97,8 +98,6 @@ interface JQueryPromise {
interface JQueryDeferred extends JQueryPromise {
notify(...args: any[]): JQueryDeferred;
notifyWith(context: any, ...args: any[]): JQueryDeferred;
promise(target? ): JQueryPromise;
reject(...args: any[]): JQueryDeferred;
rejectWith(context:any, ...args: any[]): JQueryDeferred;
resolve(...args: any[]): JQueryDeferred;

7
knockout/knockout.d.ts vendored
View File

@@ -67,12 +67,7 @@ interface KnockoutComputedStatic {
(options?: any): KnockoutComputed;
}
interface KnockoutComputed extends KnockoutComputedFunctions {
(): any;
(value: any): void;
subscribe(callback: (newValue: any) => void, target?:any, topic?: string): KnockoutSubscription;
notifySubscribers(valueToWrite, topic?: string);
interface KnockoutComputed extends KnockoutObservableAny, KnockoutComputedFunctions {
}
interface KnockoutObservableArrayStatic {