From 9ba67fffd651f8d707f67e8a8aaf144f7e6f6069 Mon Sep 17 00:00:00 2001
From: Jared Reynolds <jreynolds@daptiv.com>
Date: Wed, 16 Oct 2013 14:29:00 -0700
Subject: [PATCH] Updated angular IDirective for 1.2.0

Conflicts:
	angularjs/angular.d.ts
---
 angularjs/angular-1.0.d.ts |  6 +++---
 angularjs/angular.d.ts     | 25 +++++++++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/angularjs/angular-1.0.d.ts b/angularjs/angular-1.0.d.ts
index ce996c4e7a..52735c9bdf 100755
--- a/angularjs/angular-1.0.d.ts
+++ b/angularjs/angular-1.0.d.ts
@@ -671,15 +671,15 @@ declare module ng {
 
     interface IDirective{
         priority?: number;
-        template?: string;
-        templateUrl?: string;
+        template?: any;
+        templateUrl?: any;
         replace?: boolean;
         transclude?: any;
         restrict?: string;
         scope?: any;
         link?: Function;
         compile?: Function;
-        controller?: Function;
+        controller?: any; 
     }
 
     ///////////////////////////////////////////////////////////////////////////
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index c6279bdeea..fe3e986faf 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -640,16 +640,29 @@ declare module ng {
     ///////////////////////////////////////////////////////////////////////////
 
     interface IDirective{
+        compile?:
+            (templateElement: any,
+            templateAttributes: IAttributes,
+            transclude: (scope: IScope, cloneLinkingFn: Function) => void
+            ) => any;
+        controller?: (...injectables: any[]) => void;
+        controllerAs?: string;
+        link?:
+            (scope: IScope,
+            instanceElement: any,
+            instanceAttributes: IAttributes,
+            controller: any
+            ) => void;
+        name?: string;
         priority?: number;
-        template?: any;
-        templateUrl?: any;
         replace?: boolean;
-        transclude?: any;
+        require?: string[];
         restrict?: string;
         scope?: any;
-        link?: Function;
-        compile?: Function;
-        controller?: any;
+        template?: any;
+        templateUrl?: any;
+        terminal?: boolean;
+        transclude?: any;
     }
 
     ///////////////////////////////////////////////////////////////////////////