diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts index 1994e2af47..b171da9c14 100644 --- a/angularjs/angular-tests.ts +++ b/angularjs/angular-tests.ts @@ -29,7 +29,7 @@ angular.module('http-auth-interceptor', []) this.$get = ['$rootScope', '$injector', function ($rootScope: ng.IScope, $injector: ng.auto.IInjectorService) { var $http: ng.IHttpService; //initialized later because of circular dependency problem - function retry(config: ng.IRequestConfig, deferred: ng.IDeferred) { + function retry(config: ng.IRequestConfig, deferred: ng.IDeferred) { $http = $http || $injector.get('$http'); $http(config).then(function (response) { deferred.resolve(response); @@ -118,17 +118,17 @@ module HttpAndRegularPromiseTests { $scope.person = response.data; }); - var aPromise: ng.IPromise = $q.when({ firstName: "Jack", lastName: "Sparrow" }); + var aPromise: ng.IPromise = $q.when({ firstName: "Jack", lastName: "Sparrow" }); aPromise.then((person: Person) => { $scope.person = person; }); - var bPromise: ng.IPromise = $q.when(42); + var bPromise: ng.IPromise = $q.when(42); bPromise.then((answer: number) => { $scope.theAnswer = answer; }); - var cPromise: ng.IPromise = $q.when(["a", "b", "c"]); + var cPromise: ng.IPromise = $q.when(["a", "b", "c"]); cPromise.then((letters: string[]) => { $scope.letters = letters; }); diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index bd58db401f..3e3008f32b 100644 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -239,8 +239,8 @@ declare module ng { // see http://docs.angularjs.org/api/ng.$timeout /////////////////////////////////////////////////////////////////////////// interface ITimeoutService { - (func: Function, delay?: number, invokeApply?: boolean): IPromise; - cancel(promise: IPromise): boolean; + (func: Function, delay?: number, invokeApply?: boolean): IPromise; + cancel(promise: IPromise): boolean; } /////////////////////////////////////////////////////////////////////////// @@ -399,20 +399,20 @@ declare module ng { // see http://docs.angularjs.org/api/ng.$q /////////////////////////////////////////////////////////////////////////// interface IQService { - all(promises: IPromise[]): IPromise; - defer(): IDeferred; - reject(reason?: any): IPromise; - when(value: any): IPromise; + all(promises: IPromise[]): IPromise; + defer(): IDeferred; + reject(reason?: any): IPromise; + when(value: T): IPromise; } - interface IPromise { - then(successCallback: (promiseValue: any) => any, errorCallback?: (reason: any) => any): IPromise; + interface IPromise { + then(successCallback: (promiseValue: T) => any, errorCallback?: (reason: any) => any): IPromise; } - interface IDeferred { - resolve(value?: any): void; + interface IDeferred { + resolve(value?: T): void; reject(reason?: any): void; - promise: IPromise; + promise: IPromise; } /////////////////////////////////////////////////////////////////////////// @@ -548,10 +548,10 @@ declare module ng { config?: IRequestConfig; } - interface IHttpPromise extends IPromise { + interface IHttpPromise extends IPromise { success(callback: IHttpPromiseCallback): IHttpPromise; error(callback: IHttpPromiseCallback): IHttpPromise; - then(successCallback: (response: IHttpPromiseCallbackArg) => any, errorCallback?: (response: IHttpPromiseCallbackArg) => any): IPromise; + then(successCallback: (response: IHttpPromiseCallbackArg) => any, errorCallback?: (response: IHttpPromiseCallbackArg) => any): IPromise; } interface IHttpProvider extends IServiceProvider {