From ea3fcdda9ee552359e6f4b5552da2cfde840591e Mon Sep 17 00:00:00 2001
From: Ugaitz Urien <ugaitz@arima.eu>
Date: Thu, 11 Feb 2016 16:03:23 +0100
Subject: [PATCH] Controller field in a component can accept string, function
 or an array with parameters an function ["service1","service2",
 ControllerFunction]

---
 angularjs/angular.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 67b3eb488d..4a9a9cec73 100644
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -1685,7 +1685,7 @@ declare module angular {
          * Controller constructor function that should be associated with newly created scope or the name of a registered
          * controller if passed as a string. Empty function by default.
          */
-        controller?: string | Function;
+        controller?: any;
         /**
          * An identifier name for a reference to the controller. If present, the controller will be published to scope under
          * the controllerAs name. If not present, this will default to be the same as the component name.