Merge branch 'master' into angular-remove-any

This commit is contained in:
Ciuca, Alexandru committed 2015-08-04 17:16:34 +03:00
commit d2c8f8b955
14 files changed
+920 -187

No files matched your search

+2 -2
View File
@@ -1224,8 +1224,8 @@ declare module angular {
///////////////////////////////////////////////////////////////////////////
interface IControllerService {
// Although the documentation doesn't state this, locals are optional
(controllerConstructor: Function, locals?: any): any;
(controllerName: string, locals?: any): any;
(controllerConstructor: Function, locals?: any, bindToController?: any): any;
(controllerName: string, locals?: any, bindToController?: any): any;
}
interface IControllerProvider extends IServiceProvider {