From ce294d7ff99412b9bd1943d5e2e5e3624fd7f0ae Mon Sep 17 00:00:00 2001 From: Shridharan Chandramouli Date: Thu, 23 Feb 2017 13:10:39 -0700 Subject: [PATCH 1/4] Include static.ts in upgrade module --- modules/@angular/upgrade/tsconfig-closure.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/@angular/upgrade/tsconfig-closure.json b/modules/@angular/upgrade/tsconfig-closure.json index 25c21369cdd7..31087d389f66 100644 --- a/modules/@angular/upgrade/tsconfig-closure.json +++ b/modules/@angular/upgrade/tsconfig-closure.json @@ -23,6 +23,7 @@ }, "files": [ "index.ts", + "static.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ], "angularCompilerOptions": { From 817f74f589f346c6c938a82d0fb3b77170e1139a Mon Sep 17 00:00:00 2001 From: Shridharan Chandramouli Date: Fri, 24 Feb 2017 18:10:50 -0700 Subject: [PATCH 2/4] use bracket notation so that closure does not change variable name --- modules/@angular/upgrade/src/aot/downgrade_component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/@angular/upgrade/src/aot/downgrade_component.ts b/modules/@angular/upgrade/src/aot/downgrade_component.ts index ec846f5d3b45..dcc51b0b3388 100644 --- a/modules/@angular/upgrade/src/aot/downgrade_component.ts +++ b/modules/@angular/upgrade/src/aot/downgrade_component.ts @@ -106,6 +106,6 @@ export function downgradeComponent(info: /* ComponentInfo */ { }; }; - directiveFactory.$inject = [$INJECTOR, $PARSE]; + directiveFactory['$inject'] = [$INJECTOR, $PARSE]; return directiveFactory; -} \ No newline at end of file +} From aa379c286be1380e1b1d469d193b6f7b76fe05b2 Mon Sep 17 00:00:00 2001 From: Brooke Rhees Date: Mon, 6 Mar 2017 11:02:25 -0700 Subject: [PATCH 3/4] allow undefined for parentInjector --- modules/@angular/upgrade/src/aot/downgrade_component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/@angular/upgrade/src/aot/downgrade_component.ts b/modules/@angular/upgrade/src/aot/downgrade_component.ts index dcc51b0b3388..b644512fcc8c 100644 --- a/modules/@angular/upgrade/src/aot/downgrade_component.ts +++ b/modules/@angular/upgrade/src/aot/downgrade_component.ts @@ -81,7 +81,7 @@ export function downgradeComponent(info: /* ComponentInfo */ { link: (scope: angular.IScope, element: angular.IAugmentedJQuery, attrs: angular.IAttributes, parentInjector: Injector, transclude: angular.ITranscludeFunction) => { - if (parentInjector === null) { + if (parentInjector == null) { parentInjector = $injector.get(INJECTOR_KEY); } From e9aebb69e53cb87128f78f4ade5cc2e5ef964331 Mon Sep 17 00:00:00 2001 From: Brooke Rhees Date: Thu, 9 Mar 2017 08:23:32 -0700 Subject: [PATCH 4/4] convert key to string to prevent name mangling for compiled outputs --- modules/@angular/upgrade/src/aot/downgrade_component_adapter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/@angular/upgrade/src/aot/downgrade_component_adapter.ts b/modules/@angular/upgrade/src/aot/downgrade_component_adapter.ts index 9f73b81d7a09..e49993f87a24 100644 --- a/modules/@angular/upgrade/src/aot/downgrade_component_adapter.ts +++ b/modules/@angular/upgrade/src/aot/downgrade_component_adapter.ts @@ -155,7 +155,7 @@ export class DowngradeComponentAdapter { next: assignExpr ? ((setter: any) => (v: any /** TODO #9100 */) => setter(this.scope, v))(setter) : ((getter: any) => (v: any /** TODO #9100 */) => - getter(this.scope, {$event: v}))(getter) + getter(this.scope, {'$event': v}))(getter) }); } else { throw new Error(