Skip to content

Commit 65d7593

Browse files
committed
fix(PrivateComponentLoader): add the loader to the app injector
fixes angular#1063
1 parent 19c1773 commit 65d7593

File tree

4 files changed

+49
-0
lines changed

4 files changed

+49
-0
lines changed

modules/angular2/src/core/application.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver';
2626
import {StyleInliner} from 'angular2/src/core/compiler/style_inliner';
2727
import {CssProcessor} from 'angular2/src/core/compiler/css_processor';
2828
import {Component} from 'angular2/src/core/annotations/annotations';
29+
import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader';
2930

3031
var _rootInjector: Injector;
3132

@@ -107,6 +108,7 @@ function _injectorBindings(appComponentType): List<Binding> {
107108
StyleUrlResolver,
108109
StyleInliner,
109110
bind(CssProcessor).toFactory(() => new CssProcessor(null), []),
111+
PrivateComponentLoader,
110112
];
111113
}
112114

modules/benchmarks/src/naive_infinite_scroll/index.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver';
2424
import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
2525
import {StyleInliner} from 'angular2/src/core/compiler/style_inliner';
2626
import {CssProcessor} from 'angular2/src/core/compiler/css_processor';
27+
import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader';
2728

2829
import {If, For} from 'angular2/directives';
2930
import {App, setupReflectorForApp} from './app';
@@ -34,6 +35,8 @@ import {CompanyNameComponent, OpportunityNameComponent, OfferingNameComponent,
3435
setupReflectorForCells}
3536
from './cells';
3637

38+
import {EventManager} from 'angular2/src/core/events/event_manager';
39+
3740
export function main() {
3841
setupReflector();
3942
bootstrap(App);
@@ -303,4 +306,17 @@ export function setupReflectorForAngular() {
303306
"parameters": [],
304307
"annotations": []
305308
});
309+
310+
reflector.registerType(EventManager, {
311+
"factory": () => new EventManager([], null),
312+
"parameters": [],
313+
"annotations": []
314+
});
315+
316+
reflector.registerType(PrivateComponentLoader, {
317+
"factory": (compiler, strategy, eventMgr, reader) =>
318+
new PrivateComponentLoader(compiler, strategy, eventMgr, reader),
319+
"parameters": [[Compiler], [ShadowDomStrategy], [EventManager], [DirectiveMetadataReader]],
320+
"annotations": []
321+
});
306322
}

modules/benchmarks/src/tree/tree_benchmark.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver';
1717
import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
1818
import {StyleInliner} from 'angular2/src/core/compiler/style_inliner';
1919
import {CssProcessor} from 'angular2/src/core/compiler/css_processor';
20+
import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader';
2021

2122
import {reflector} from 'angular2/src/reflection/reflection';
2223
import {DOM} from 'angular2/src/dom/dom_adapter';
@@ -30,6 +31,8 @@ import {XHRImpl} from 'angular2/src/core/compiler/xhr/xhr_impl';
3031
import {If} from 'angular2/directives';
3132
import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
3233

34+
import {EventManager} from 'angular2/src/core/events/event_manager';
35+
3336
function setupReflector() {
3437
// TODO: Put the general calls to reflector.register... in a shared file
3538
// as they are needed in all benchmarks...
@@ -190,6 +193,19 @@ function setupReflector() {
190193
"annotations": []
191194
});
192195

196+
reflector.registerType(EventManager, {
197+
"factory": () => new EventManager([], null),
198+
"parameters": [],
199+
"annotations": []
200+
});
201+
202+
reflector.registerType(PrivateComponentLoader, {
203+
"factory": (compiler, strategy, eventMgr, reader) =>
204+
new PrivateComponentLoader(compiler, strategy, eventMgr, reader),
205+
"parameters": [[Compiler], [ShadowDomStrategy], [EventManager], [DirectiveMetadataReader]],
206+
"annotations": []
207+
});
208+
193209
reflector.registerGetters({
194210
'value': (a) => a.value,
195211
'left': (a) => a.left,

modules/examples/src/hello_world/index_static.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import {StyleUrlResolver} from 'angular2/src/core/compiler/style_url_resolver';
1919
import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
2020
import {StyleInliner} from 'angular2/src/core/compiler/style_inliner';
2121
import {CssProcessor} from 'angular2/src/core/compiler/css_processor';
22+
import {EventManager} from 'angular2/src/core/events/event_manager';
23+
import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader';
2224

2325
import {reflector} from 'angular2/src/reflection/reflection';
2426

@@ -170,6 +172,19 @@ function setup() {
170172
"annotations": []
171173
});
172174

175+
reflector.registerType(EventManager, {
176+
"factory": () => new EventManager([], null),
177+
"parameters": [],
178+
"annotations": []
179+
});
180+
181+
reflector.registerType(PrivateComponentLoader, {
182+
"factory": (compiler, strategy, eventMgr, reader) =>
183+
new PrivateComponentLoader(compiler, strategy, eventMgr, reader),
184+
"parameters": [[Compiler], [ShadowDomStrategy], [EventManager], [DirectiveMetadataReader]],
185+
"annotations": []
186+
});
187+
173188
reflector.registerGetters({
174189
"greeting": (a) => a.greeting
175190
});

0 commit comments

Comments
 (0)