From 417b93032f59bf22e43db30a96583d0ce924f4b8 Mon Sep 17 00:00:00 2001 From: RupertAvery Date: Tue, 5 Nov 2013 07:00:20 +0800 Subject: [PATCH 1/3] added Strict Contextual Escaping services and providers --- angularjs/angular.d.ts | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 83e0c9044..9399cc469 100755 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -649,6 +649,58 @@ declare module ng { /////////////////////////////////////////////////////////////////////////// interface IRootScopeService extends IScope {} + /////////////////////////////////////////////////////////////////////////// + // SCEService + // see http://docs.angularjs.org/api/ng.$sce + /////////////////////////////////////////////////////////////////////////// + interface ISCEService { + getTrusted(type: string, mayBeTrusted: any): any; + getTrustedCss(value: any): any; + getTrustedHtml(value: any): any; + getTrustedJs(value: any): any; + getTrustedResourceUrl(value: any): any; + getTrustedUrl(value: any): any; + parse(type: string, expression: string): (context: any, locals: any) => any; + parseAsCss(expression: string): (context: any, locals: any) => any; + parseAsHtml(expression: string): (context: any, locals: any) => any; + parseAsJs(expression: string): (context: any, locals: any) => any; + parseAsResourceUrl(expression: string): (context: any, locals: any) => any; + parseAsUrl(expression: string): (context: any, locals: any) => any; + trustAs(type: string, value: any): any; + trustAsHtml(value: any): any; + trustAsJs(value: any): any; + trustAsResourceUrl(value: any): any; + trustAsUrl(value: any): any; + isEnabled(): bool; + } + + /////////////////////////////////////////////////////////////////////////// + // SCEProvider + // see http://docs.angularjs.org/api/ng.$sceProvider + /////////////////////////////////////////////////////////////////////////// + interface ISCEProvider extends IServiceProvider { + enabled(value: bool): void; + } + + /////////////////////////////////////////////////////////////////////////// + // SCEDelegateService + // see http://docs.angularjs.org/api/ng.$sceDelegate + /////////////////////////////////////////////////////////////////////////// + interface ISCEDelegateService { + getTrusted(type: string, mayBeTrusted: any): any; + trustAs(type: string, value: any): any; + valueOf(value: any): any; + } + + /////////////////////////////////////////////////////////////////////////// + // SCEDelegateProvider + // see http://docs.angularjs.org/api/ng.$sceDelegateProvider + /////////////////////////////////////////////////////////////////////////// + interface ISCEDelegateProvider extends IServiceProvider { + resourceUrlBlacklist(blacklist: any[]): void; + resourceUrlWhitelist(whitelist: any[]): void; + } + /////////////////////////////////////////////////////////////////////////// // Directive // see http://docs.angularjs.org/api/ng.$compileProvider#directive From e3d4e2fd6838f2bf4033bd63db25185ceec614cf Mon Sep 17 00:00:00 2001 From: RupertAvery Date: Sun, 10 Nov 2013 17:13:43 +0800 Subject: [PATCH 2/3] change bool to boolean --- angularjs/angular.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 9399cc469..1698f4a04 100755 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -671,7 +671,7 @@ declare module ng { trustAsJs(value: any): any; trustAsResourceUrl(value: any): any; trustAsUrl(value: any): any; - isEnabled(): bool; + isEnabled(): boolean; } /////////////////////////////////////////////////////////////////////////// @@ -679,7 +679,7 @@ declare module ng { // see http://docs.angularjs.org/api/ng.$sceProvider /////////////////////////////////////////////////////////////////////////// interface ISCEProvider extends IServiceProvider { - enabled(value: bool): void; + enabled(value: boolean): void; } /////////////////////////////////////////////////////////////////////////// From 16f8fd18dd7fb00a8be6990a2bbfc1154f288714 Mon Sep 17 00:00:00 2001 From: RupertAvery Date: Sun, 10 Nov 2013 19:47:22 +0800 Subject: [PATCH 3/3] SCE Services and Providers --- angularjs/angular.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 1698f4a04..921cbafc9 100755 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -692,6 +692,7 @@ declare module ng { valueOf(value: any): any; } + /////////////////////////////////////////////////////////////////////////// // SCEDelegateProvider // see http://docs.angularjs.org/api/ng.$sceDelegateProvider