Skip to content

Include static.ts in upgrade module #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdharan wants to merge 4 commits into
base: closure-bundle-2-2-0
Choose a base branch
from
Open

Include static.ts in upgrade module #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce294d7
Include static.ts in upgrade module
Feb 23, 2017
817f74f
use bracket notation so that closure does not change variable name
Feb 25, 2017
aa379c2
allow undefined for parentInjector
Mar 6, 2017
e9aebb6
convert key to string to prevent name mangling for compiled outputs
Mar 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/@angular/upgrade/src/aot/downgrade_component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -106,6 +106,6 @@ export function downgradeComponent(info: /* ComponentInfo */ {
};
};

directiveFactory.$inject = [$INJECTOR, $PARSE];
directiveFactory['$inject'] = [$INJECTOR, $PARSE];
return directiveFactory;
}
}
2 changes: 1 addition & 1 deletion modules/@angular/upgrade/src/aot/downgrade_component_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions modules/@angular/upgrade/tsconfig-closure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"files": [
"index.ts",
"static.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts"
],
"angularCompilerOptions": {
Expand Down