Updated angular IDirective for 1.2.0

Conflicts:
	angularjs/angular.d.ts
This commit is contained in:
Jared Reynolds 2013-10-16 14:29:00 -07:00 committed by John Emau
parent 604c5b5d6f
commit 9ba67fffd6
2 changed files with 22 additions and 9 deletions

View File

@ -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;
}
///////////////////////////////////////////////////////////////////////////

View File

@ -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;
}
///////////////////////////////////////////////////////////////////////////