Merge pull request #597 from teves-castro/master

Correction to QStatic method signatures
This commit is contained in:
Boris Yankov
2013-06-06 10:31:50 -07:00
2 changed files with 4 additions and 3 deletions

3
breeze/breeze.d.ts vendored
View File

@@ -586,7 +586,8 @@ declare module breeze {
isEmpty(): bool;
registerEntityTypeCtor(entityTypeName: string, entityCtor: Function, initializationFn?: (entity: Entity) =>void ): void;
trackUnmappedType(entityCtor: Function, interceptor?: Function);
}
setEntityTypeForResourceName(resourceName: string, entityTypeOrName: string): void;
}
interface MetadataStoreOptions {
namingConvention?: NamingConvention;

4
q/Q.d.ts vendored
View File

@@ -36,13 +36,13 @@ interface Qpromise {
}
interface QStatic {
when(value: any, onFulfilled: Function, onRejected?: Function): Qpromise;
when(value: any, onFulfilled?: Function, onRejected?: Function): Qpromise;
try(method: Function, ...args: any[]): Qpromise;
fbind(method: Function, ...args: any[]): Qpromise;
fcall(method: Function, ...args: any[]): Qpromise;
all(promises: Qpromise[]): Qpromise;
allResolved(promises: Qpromise[]): Qpromise;
resolve(object?:Qpromise);
resolve(object:any):Qpromise;
spread(onFulfilled: Function, onRejected: Function): Qpromise;
timeout(ms: number): Qpromise;
delay(ms: number): Qpromise;