vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-04-03 12:14:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into angular-component-router

Browse Source 
Conflicts:
	angularjs/angular.d.ts
This commit is contained in:
David Reher
2015-12-30 11:54:44 +01:00
parent f7e1375583 dc9dabe74a
commit 739b784dae
50 changed files with 9733 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
angularjs/angular.d.ts vendored
View File

@@ -1632,7 +1632,6 @@ declare module angular {
// see http://angularjs.blogspot.com.br/2015/11/angularjs-15-beta2-and-14-releases.html
// and http://toddmotto.com/exploring-the-angular-1-5-component-method/
///////////////////////////////////////////////////////////////////////////
/**
* Runtime representation a type that a Component or other object is instances of.
*
@@ -1728,6 +1727,10 @@ declare module angular {
$routeConfig?: RouteDefinition[];
}
interface IComponentTemplateFn {
( $element?: IAugmentedJQuery, $attrs?: IAttributes ): string;
}
///////////////////////////////////////////////////////////////////////////
// Directive
// see http://docs.angularjs.org/api/ng.$compileProvider#directive