diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 6a656b00b..f3e7dc000 100755 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -452,6 +452,7 @@ declare module ng { /////////////////////////////////////////////////////////////////////////// interface IQService { all(promises: IPromise[]): IPromise; + all(promises: {[id: string]: IPromise;}): IPromise<{[id: string]: any}>; defer(): IDeferred; reject(reason?: any): IPromise; when(value: T): IPromise; @@ -747,12 +748,14 @@ declare module ng { ) => any; controller?: any; controllerAs?: string; + // A link function with no arguments is perfectly valid; the norm seems + // to be passing the scope, element and attributes. link?: - (scope: IScope, - instanceElement: IAugmentedJQuery, - instanceAttributes: IAttributes, - controller: any, - transclude: ITranscludeFunction + (scope?: IScope, + instanceElement?: IAugmentedJQuery, + instanceAttributes?: IAttributes, + controller?: any, + transclude?: ITranscludeFunction ) => void; name?: string; priority?: number; diff --git a/requirejs/require.d.ts b/requirejs/require.d.ts index e52f8197a..a85699c77 100644 --- a/requirejs/require.d.ts +++ b/requirejs/require.d.ts @@ -249,6 +249,12 @@ interface Require { **/ (modules: string[], ready: Function): void; + /** + * @see http://requirejs.org/docs/api.html#errbacks + * @param ready Called when required modules are ready. + **/ + (modules: string[], ready: Function, errback: Function): void; + /** * Generate URLs from require module * @param module Module to URL