From bd9d835aa7ffa87bd085d386e207e3c6660ff460 Mon Sep 17 00:00:00 2001
From: unknown <j201.alex@gmail.com>
Date: Fri, 14 Mar 2014 11:13:07 -0400
Subject: [PATCH] Fix $q.when definition

---
 angularjs/angular-tests.ts | 7 +++++++
 angularjs/angular.d.ts     | 1 +
 2 files changed, 8 insertions(+)

diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index 4ce3116985..90f77fd7c2 100644
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -94,6 +94,7 @@ module HttpAndRegularPromiseTests {
         person: Person;
         theAnswer: number;
         letters: string[];
+		snack: string;
     }
 
     var someController: Function = ($scope: SomeControllerScope, $http: ng.IHttpService, $q: ng.IQService) => {
@@ -132,6 +133,12 @@ module HttpAndRegularPromiseTests {
         cPromise.then((letters: string[]) => {
             $scope.letters = letters;
         });
+
+		// When $q.when is passed an IPromise<T>, it returns an IPromise<T>
+		var dPromise: ng.IPromise<string> = $q.when($q.when("ALBATROSS!"));
+		dPromise.then((snack: string) => {
+			$scope.snack = snack;
+		});
     }
 
   // Test that we can pass around a type-checked success/error Promise Callback
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index b369a271f8..b7a258be68 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -455,6 +455,7 @@ declare module ng {
         all(promises: {[id: string]: IPromise<any>;}): IPromise<{[id: string]: any}>;
         defer<T>(): IDeferred<T>;
         reject(reason?: any): IPromise<void>;
+        when<T>(value: IPromise<T>): IPromise<T>;
         when<T>(value: T): IPromise<T>;
     }