Merge pull request #2659 from borisyankov/def/angular

angular: $scope extends $rootScope. closes #2593
This commit is contained in:
Basarat Ali Syed
2014-08-10 21:00:52 +10:00

View File

@@ -312,8 +312,8 @@ declare module ng {
}
///////////////////////////////////////////////////////////////////////////
// Scope
// see http://docs.angularjs.org/api/ng.$rootScope.Scope
// Scope and RootScope
// see https://docs.angularjs.org/api/ng/type/$rootScope.Scope and http://docs.angularjs.org/api/ng.$rootScope
///////////////////////////////////////////////////////////////////////////
interface IRootScopeService {
$apply(): any;
@@ -361,6 +361,10 @@ declare module ng {
$$phase: any;
}
interface IScope extends IRootScopeService {
[index: string]: any;
}
interface IAngularEvent {
targetScope: IScope;
currentScope: IScope;
@@ -963,14 +967,6 @@ declare module ng {
///////////////////////////////////////////////////////////////////////////
interface ITemplateCacheService extends ICacheObject {}
///////////////////////////////////////////////////////////////////////////
// RootScopeService
// see http://docs.angularjs.org/api/ng.$rootScope
///////////////////////////////////////////////////////////////////////////
interface IScope extends IRootScopeService {
[index: string]: any;
}
///////////////////////////////////////////////////////////////////////////
// SCEService
// see http://docs.angularjs.org/api/ng.$sce