From b7dda17cc1b21040560192daeccead6114fdce8f Mon Sep 17 00:00:00 2001
From: Paulo Cesar <email@pocesar.e4ward.com>
Date: Sat, 2 Aug 2014 13:59:17 -0300
Subject: [PATCH] angular directive changes, still missing #2605

---
 angularjs/angular-tests.ts | 461 ++++++++++++++++++++-----------------
 angularjs/angular.d.ts     |  38 +--
 2 files changed, 269 insertions(+), 230 deletions(-)

diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index a1577856e4..2507d7f8c6 100644
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -231,11 +231,11 @@ foo.then((x) => {
 }).then((x) => {
     // Object is inferred here
     x.a = 123;
-    //Try a promise 
+    //Try a promise
     var y: ng.IPromise<number>;
-    return y; 
+    return y;
 }).then((x) => {
-    // x is infered to be a number, which is the resolved value of a promise 
+    // x is infered to be a number, which is the resolved value of a promise
     x.toFixed();
 });
 
@@ -281,252 +281,279 @@ test_IAttributes({
     $attr: {}
 });
 
+class SampleDirective implements ng.IDirective {
+    public restrict = 'A';
+    name = 'doh';
+
+    compile(templateElement: any) {
+        return this.link;
+    }
+
+    link(scope: any) {
+
+    }
+}
+
+class SampleDirective2 implements ng.IDirective {
+    public restrict = 'EAC';
+
+    compile(templateElement: any) {
+        return {
+            pre: this.link
+        };
+    }
+
+    link(scope: any) {
+
+    }
+}
+
 // test from https://docs.angularjs.org/guide/directive
 angular.module('docsSimpleDirective', [])
-	.controller('Controller', ['$scope', function($scope: any) {
-		$scope.customer = {
-			name: 'Naomi',
-			address: '1600 Amphitheatre'
-		};
-	}])
-	.directive('myCustomer', function() {
-		return {
-			template: 'Name: {{customer.name}} Address: {{customer.address}}'
-		};
-	});
+    .controller('Controller', ['$scope', function($scope: any) {
+        $scope.customer = {
+            name: 'Naomi',
+            address: '1600 Amphitheatre'
+        };
+    }])
+    .directive('myCustomer', function() {
+        return {
+            template: 'Name: {{customer.name}} Address: {{customer.address}}'
+        };
+    });
 
 angular.module('docsTemplateUrlDirective', [])
-	.controller('Controller', ['$scope', function($scope: any) {
-		$scope.customer = {
-			name: 'Naomi',
-			address: '1600 Amphitheatre'
-		};
-	}])
-	.directive('myCustomer', function() {
-		return {
-			templateUrl: 'my-customer.html'
-		};
-	});
+    .controller('Controller', ['$scope', function($scope: any) {
+        $scope.customer = {
+            name: 'Naomi',
+            address: '1600 Amphitheatre'
+        };
+    }])
+    .directive('myCustomer', function() {
+        return {
+            templateUrl: 'my-customer.html'
+        };
+    });
 
 angular.module('docsRestrictDirective', [])
-	.controller('Controller', ['$scope', function($scope: any) {
-		$scope.customer = {
-			name: 'Naomi',
-			address: '1600 Amphitheatre'
-		};
-	}])
-	.directive('myCustomer', function() {
-		return {
-			restrict: 'E',
-			templateUrl: 'my-customer.html'
-		};
-	});
+    .controller('Controller', ['$scope', function($scope: any) {
+        $scope.customer = {
+            name: 'Naomi',
+            address: '1600 Amphitheatre'
+        };
+    }])
+    .directive('myCustomer', function() {
+        return {
+            restrict: 'E',
+            templateUrl: 'my-customer.html'
+        };
+    });
 
 angular.module('docsScopeProblemExample', [])
-	.controller('NaomiController', ['$scope', function($scope: any) {
-		$scope.customer = {
-			name: 'Naomi',
-			address: '1600 Amphitheatre'
-		};
-	}])
-	.controller('IgorController', ['$scope', function($scope: any) {
-		$scope.customer = {
-			name: 'Igor',
-			address: '123 Somewhere'
-		};
-	}])
-	.directive('myCustomer', function() {
-		return {
-			restrict: 'E',
-			templateUrl: 'my-customer.html'
-		};
-	});
+    .controller('NaomiController', ['$scope', function($scope: any) {
+        $scope.customer = {
+            name: 'Naomi',
+            address: '1600 Amphitheatre'
+        };
+    }])
+    .controller('IgorController', ['$scope', function($scope: any) {
+        $scope.customer = {
+            name: 'Igor',
+            address: '123 Somewhere'
+        };
+    }])
+    .directive('myCustomer', function() {
+        return {
+            restrict: 'E',
+            templateUrl: 'my-customer.html'
+        };
+    });
 
 angular.module('docsIsolateScopeDirective', [])
-	.controller('Controller', ['$scope', function($scope: any) {
-		$scope.naomi = { name: 'Naomi', address: '1600 Amphitheatre' };
-		$scope.igor = { name: 'Igor', address: '123 Somewhere' };
-	}])
-	.directive('myCustomer', function() {
-		return {
-			restrict: 'E',
-			scope: {
-				customerInfo: '=info'
-			},
-			templateUrl: 'my-customer-iso.html'
-		};
-	});
+    .controller('Controller', ['$scope', function($scope: any) {
+        $scope.naomi = { name: 'Naomi', address: '1600 Amphitheatre' };
+        $scope.igor = { name: 'Igor', address: '123 Somewhere' };
+    }])
+    .directive('myCustomer', function() {
+        return {
+            restrict: 'E',
+            scope: {
+                customerInfo: '=info'
+            },
+            templateUrl: 'my-customer-iso.html'
+        };
+    });
 
 angular.module('docsIsolationExample', [])
-	.controller('Controller', ['$scope', function($scope: any) {
-		$scope.naomi = { name: 'Naomi', address: '1600 Amphitheatre' };
-		$scope.vojta = { name: 'Vojta', address: '3456 Somewhere Else' };
-	}])
-	.directive('myCustomer', function() {
-		return {
-			restrict: 'E',
-			scope: {
-				customerInfo: '=info'
-			},
-			templateUrl: 'my-customer-plus-vojta.html'
-		};
-	});
+    .controller('Controller', ['$scope', function($scope: any) {
+        $scope.naomi = { name: 'Naomi', address: '1600 Amphitheatre' };
+        $scope.vojta = { name: 'Vojta', address: '3456 Somewhere Else' };
+    }])
+    .directive('myCustomer', function() {
+        return {
+            restrict: 'E',
+            scope: {
+                customerInfo: '=info'
+            },
+            templateUrl: 'my-customer-plus-vojta.html'
+        };
+    });
 
 angular.module('docsTimeDirective', [])
-	.controller('Controller', ['$scope', function($scope: any) {
-		$scope.format = 'M/d/yy h:mm:ss a';
-	}])
-	.directive('myCurrentTime', ['$interval', 'dateFilter', function($interval: any, dateFilter: any): ng.IDirective {
+    .controller('Controller', ['$scope', function($scope: any) {
+        $scope.format = 'M/d/yy h:mm:ss a';
+    }])
+    .directive('myCurrentTime', ['$interval', 'dateFilter', function($interval: any, dateFilter: any): ng.IDirective {
 
-		return {
-			link: function(scope: any, element: any, attrs: any) {
-				var format: any,
-					timeoutId: any;
+        return {
+            link: function(scope: any, element: any, attrs: any) {
+                var format: any,
+                    timeoutId: any;
 
-				function updateTime() {
-					element.text(dateFilter(new Date(), format));
-				}
+                function updateTime() {
+                    element.text(dateFilter(new Date(), format));
+                }
 
-				scope.$watch(attrs.myCurrentTime, function (value: any) {
-					format = value;
-					updateTime();
-				});
+                scope.$watch(attrs.myCurrentTime, function (value: any) {
+                    format = value;
+                    updateTime();
+                });
 
-				element.on('$destroy', function () {
-					$interval.cancel(timeoutId);
-				});
+                element.on('$destroy', function () {
+                    $interval.cancel(timeoutId);
+                });
 
-				// start the UI update process; save the timeoutId for canceling
-				timeoutId = $interval(function () {
-					updateTime(); // update DOM
-				}, 1000);
-			}
-		};
-	}]);
+                // start the UI update process; save the timeoutId for canceling
+                timeoutId = $interval(function () {
+                    updateTime(); // update DOM
+                }, 1000);
+            }
+        };
+    }]);
 
 angular.module('docsTransclusionDirective', [])
-	.controller('Controller', ['$scope', function($scope: any) {
-		$scope.name = 'Tobias';
-	}])
-	.directive('myDialog', function() {
-		return {
-			restrict: 'E',
-			transclude: true,
-			templateUrl: 'my-dialog.html'
-		};
-	});
+    .controller('Controller', ['$scope', function($scope: any) {
+        $scope.name = 'Tobias';
+    }])
+    .directive('myDialog', function() {
+        return {
+            restrict: 'E',
+            transclude: true,
+            templateUrl: 'my-dialog.html'
+        };
+    });
 
 angular.module('docsTransclusionExample', [])
-	.controller('Controller', ['$scope', function($scope: any) {
-		$scope.name = 'Tobias';
-	}])
-	.directive('myDialog', function() {
-		return {
-			restrict: 'E',
-			transclude: true,
-			scope: {},
-			templateUrl: 'my-dialog.html',
-			link: function (scope: any, element: any) {
-				scope.name = 'Jeff';
-			}
-		};
-	});
+    .controller('Controller', ['$scope', function($scope: any) {
+        $scope.name = 'Tobias';
+    }])
+    .directive('myDialog', function() {
+        return {
+            restrict: 'E',
+            transclude: true,
+            scope: {},
+            templateUrl: 'my-dialog.html',
+            link: function (scope: any, element: any) {
+                scope.name = 'Jeff';
+            }
+        };
+    });
 
 angular.module('docsIsoFnBindExample', [])
-	.controller('Controller', ['$scope', '$timeout', function($scope: any, $timeout: any) {
-		$scope.name = 'Tobias';
-		$scope.hideDialog = function () {
-			$scope.dialogIsHidden = true;
-			$timeout(function () {
-				$scope.dialogIsHidden = false;
-			}, 2000);
-		};
-	}])
-	.directive('myDialog', function() {
-		return {
-			restrict: 'E',
-			transclude: true,
-			scope: {
-				'close': '&onClose'
-			},
-			templateUrl: 'my-dialog-close.html'
-		};
-	});
+    .controller('Controller', ['$scope', '$timeout', function($scope: any, $timeout: any) {
+        $scope.name = 'Tobias';
+        $scope.hideDialog = function () {
+            $scope.dialogIsHidden = true;
+            $timeout(function () {
+                $scope.dialogIsHidden = false;
+            }, 2000);
+        };
+    }])
+    .directive('myDialog', function() {
+        return {
+            restrict: 'E',
+            transclude: true,
+            scope: {
+                'close': '&onClose'
+            },
+            templateUrl: 'my-dialog-close.html'
+        };
+    });
 
 angular.module('dragModule', [])
-	.directive('myDraggable', ['$document', function($document: any) {
-		return function(scope: any, element: any, attr: any) {
-			var startX = 0, startY = 0, x = 0, y = 0;
+    .directive('myDraggable', ['$document', function($document: any) {
+        return function(scope: any, element: any, attr: any) {
+            var startX = 0, startY = 0, x = 0, y = 0;
 
-			element.css({
-				position: 'relative',
-				border: '1px solid red',
-				backgroundColor: 'lightgrey',
-				cursor: 'pointer'
-			});
+            element.css({
+                position: 'relative',
+                border: '1px solid red',
+                backgroundColor: 'lightgrey',
+                cursor: 'pointer'
+            });
 
-			element.on('mousedown', function(event: any) {
-				// Prevent default dragging of selected content
-				event.preventDefault();
-				startX = event.pageX - x;
-				startY = event.pageY - y;
-				$document.on('mousemove', mousemove);
-				$document.on('mouseup', mouseup);
-			});
+            element.on('mousedown', function(event: any) {
+                // Prevent default dragging of selected content
+                event.preventDefault();
+                startX = event.pageX - x;
+                startY = event.pageY - y;
+                $document.on('mousemove', mousemove);
+                $document.on('mouseup', mouseup);
+            });
 
-			function mousemove(event: any) {
-				y = event.pageY - startY;
-				x = event.pageX - startX;
-				element.css({
-					top: y + 'px',
-					left:  x + 'px'
-				});
-			}
+            function mousemove(event: any) {
+                y = event.pageY - startY;
+                x = event.pageX - startX;
+                element.css({
+                    top: y + 'px',
+                    left:  x + 'px'
+                });
+            }
 
-			function mouseup() {
-				$document.off('mousemove', mousemove);
-				$document.off('mouseup', mouseup);
-			}
-		};
-	}]);
+            function mouseup() {
+                $document.off('mousemove', mousemove);
+                $document.off('mouseup', mouseup);
+            }
+        };
+    }]);
 
 angular.module('docsTabsExample', [])
-	.directive('myTabs', function() {
-		return {
-			restrict: 'E',
-			transclude: true,
-			scope: {},
-			controller: function($scope: any) {
-				var panes: any = $scope.panes = [];
+    .directive('myTabs', function() {
+        return {
+            restrict: 'E',
+            transclude: true,
+            scope: {},
+            controller: function($scope: any) {
+                var panes: any = $scope.panes = [];
 
-				$scope.select = function(pane: any) {
-					angular.forEach(panes, function(pane: any) {
-						pane.selected = false;
-					});
-					pane.selected = true;
-				};
+                $scope.select = function(pane: any) {
+                    angular.forEach(panes, function(pane: any) {
+                        pane.selected = false;
+                    });
+                    pane.selected = true;
+                };
 
-				this.addPane = function(pane: any) {
-					if (panes.length === 0) {
-						$scope.select(pane);
-					}
-					panes.push(pane);
-				};
-			},
-			templateUrl: 'my-tabs.html'
-		};
-	})
-	.directive('myPane', function() {
-		return {
-			require: '^myTabs',
-			restrict: 'E',
-			transclude: true,
-			scope: {
-				title: '@'
-			},
-			link: function(scope, element, attrs, tabsCtrl) {
-				tabsCtrl.addPane(scope);
-			},
-			templateUrl: 'my-pane.html'
-		};
-	});
+                this.addPane = function(pane: any) {
+                    if (panes.length === 0) {
+                        $scope.select(pane);
+                    }
+                    panes.push(pane);
+                };
+            },
+            templateUrl: 'my-tabs.html'
+        };
+    })
+    .directive('myPane', function() {
+        return {
+            require: '^myTabs',
+            restrict: 'E',
+            transclude: true,
+            scope: {
+                title: '@'
+            },
+            link: function(scope: any, element: any, attrs: any, tabsCtrl: any) {
+                tabsCtrl.addPane(scope);
+            },
+            templateUrl: 'my-pane.html'
+        };
+    });
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index e447985fba..b1b5e358f9 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -1031,22 +1031,34 @@ declare module ng {
         (...args: any[]): IDirective;
     }
 
+    interface IDirectiveLinkFn {
+        (
+            scope?: IScope,
+            instanceElement?: IAugmentedJQuery,
+            instanceAttributes?: IAttributes,
+            controller?: any,
+            transclude?: ITranscludeFunction
+        ): void;
+    }
 
-    interface IDirective{
-        compile?:
-            (templateElement: IAugmentedJQuery,
-            templateAttributes: IAttributes,
-            transclude: ITranscludeFunction
-            ) => any;
+    interface IDirectivePrePost {
+        pre?: IDirectiveLinkFn;
+        post?: IDirectiveLinkFn;
+    }
+
+    interface IDirectiveCompileFn {
+        (
+            templateElement?: IAugmentedJQuery,
+            templateAttributes?: IAttributes,
+            transclude?: ITranscludeFunction
+        ): IDirectivePrePost;
+    }
+
+    interface IDirective {
+        compile?: IDirectiveCompileFn;
         controller?: any;
         controllerAs?: string;
-        link?:
-            (scope: IScope,
-            instanceElement: IAugmentedJQuery,
-            instanceAttributes: IAttributes,
-            controller: any,
-            transclude: ITranscludeFunction
-            ) => void;
+        link?: IDirectivePrePost;
         name?: string;
         priority?: number;
         replace?: boolean;