X Tutup
Skip to content

Commit 1100c9b

Browse files
vsavkinvsavkin
committed
fix(web-workers): fix bindings
1 parent f3ab527 commit 1100c9b

File tree

4 files changed

+32
-15
lines changed

4 files changed

+32
-15
lines changed

‎modules/angular2/http.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import {bind, Binding} from 'angular2/core';
88
import {Http, Jsonp} from './src/http/http';
99
import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
10-
import {JSONPBackend, JSONPConnection} from './src/http/backends/jsonp_backend';
10+
import {JSONPBackend, JSONPBackend_, JSONPConnection} from './src/http/backends/jsonp_backend';
1111
import {BrowserXhr} from './src/http/backends/browser_xhr';
1212
import {BrowserJsonp} from './src/http/backends/browser_jsonp';
1313
import {BaseRequestOptions, RequestOptions} from './src/http/base_request_options';
@@ -278,5 +278,5 @@ export const JSONP_BINDINGS: any[] = [
278278
BrowserJsonp,
279279
bind(RequestOptions).toClass(BaseRequestOptions),
280280
bind(ResponseOptions).toClass(BaseResponseOptions),
281-
JSONPBackend
281+
bind(JSONPBackend).toClass(JSONPBackend_)
282282
];

‎modules/angular2/src/web_workers/ui/di_bindings.ts‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_g
1818
import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool';
1919
import {Renderer} from 'angular2/src/core/render/api';
2020
import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url';
21-
import {DomRenderer, DOCUMENT} from 'angular2/src/core/render/render';
21+
import {DomRenderer, DomRenderer_, DOCUMENT} from 'angular2/src/core/render/render';
2222
import {APP_ID_RANDOM_BINDING} from 'angular2/src/core/application_tokens';
2323
import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry';
2424
import {
@@ -30,13 +30,16 @@ import {
3030
} from 'angular2/src/core/render/dom/shared_styles_host';
3131
import {DOM} from 'angular2/src/core/dom/dom_adapter';
3232
import {NgZone} from 'angular2/src/core/zone/ng_zone';
33-
import {AppViewManager} from 'angular2/src/core/linker/view_manager';
33+
import {AppViewManager, AppViewManager_} from 'angular2/src/core/linker/view_manager';
3434
import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils';
3535
import {AppViewListener} from 'angular2/src/core/linker/view_listener';
3636
import {ViewResolver} from 'angular2/src/core/linker/view_resolver';
3737
import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver';
3838
import {ExceptionHandler} from 'angular2/src/core/facade/exceptions';
39-
import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader';
39+
import {
40+
DynamicComponentLoader,
41+
DynamicComponentLoader_
42+
} from 'angular2/src/core/linker/dynamic_component_loader';
4043
import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
4144
import {Testability} from 'angular2/src/core/testability/testability';
4245
import {XHR} from 'angular2/src/core/compiler/xhr';
@@ -53,8 +56,14 @@ import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
5356
import {MessageBasedRenderer} from 'angular2/src/web_workers/ui/renderer';
5457
import {MessageBasedXHRImpl} from 'angular2/src/web_workers/ui/xhr_impl';
5558
import {WebWorkerSetup} from 'angular2/src/web_workers/ui/setup';
56-
import {ServiceMessageBrokerFactory} from 'angular2/src/web_workers/shared/service_message_broker';
57-
import {ClientMessageBrokerFactory} from 'angular2/src/web_workers/shared/client_message_broker';
59+
import {
60+
ServiceMessageBrokerFactory,
61+
ServiceMessageBrokerFactory_
62+
} from 'angular2/src/web_workers/shared/service_message_broker';
63+
import {
64+
ClientMessageBrokerFactory,
65+
ClientMessageBrokerFactory_
66+
} from 'angular2/src/web_workers/shared/client_message_broker';
5867

5968
var _rootInjector: Injector;
6069

@@ -71,7 +80,7 @@ function _injectorBindings(): any[] {
7180
new Binding(EVENT_MANAGER_PLUGINS, {toClass: DomEventsPlugin, multi: true}),
7281
new Binding(EVENT_MANAGER_PLUGINS, {toClass: KeyEventsPlugin, multi: true}),
7382
new Binding(EVENT_MANAGER_PLUGINS, {toClass: HammerGesturesPlugin, multi: true}),
74-
DomRenderer,
83+
bind(DomRenderer).toClass(DomRenderer_),
7584
bind(Renderer).toAlias(DomRenderer),
7685
APP_ID_RANDOM_BINDING,
7786
DomSharedStylesHost,
@@ -83,7 +92,7 @@ function _injectorBindings(): any[] {
8392
RenderProtoViewRefStore,
8493
AppViewPool,
8594
bind(APP_VIEW_POOL_CAPACITY).toValue(10000),
86-
AppViewManager,
95+
bind(AppViewManager).toClass(AppViewManager_),
8796
AppViewManagerUtils,
8897
AppViewListener,
8998
ProtoViewFactory,
@@ -95,16 +104,16 @@ function _injectorBindings(): any[] {
95104
bind(ExceptionHandler).toFactory(() => new ExceptionHandler(DOM), []),
96105
bind(XHR).toValue(new XHRImpl()),
97106
UrlResolver,
98-
DynamicComponentLoader,
107+
bind(DynamicComponentLoader).toClass(DynamicComponentLoader_),
99108
Testability,
100109
AnchorBasedAppRootUrl,
101110
bind(AppRootUrl).toAlias(AnchorBasedAppRootUrl),
102111
WebWorkerApplication,
103112
WebWorkerSetup,
104113
MessageBasedXHRImpl,
105114
MessageBasedRenderer,
106-
ServiceMessageBrokerFactory,
107-
ClientMessageBrokerFactory,
115+
bind(ServiceMessageBrokerFactory).toClass(ServiceMessageBrokerFactory_),
116+
bind(ClientMessageBrokerFactory).toClass(ClientMessageBrokerFactory_),
108117
BrowserDetails,
109118
AnimationBuilder,
110119
];

‎modules/angular2/src/web_workers/worker/application_common.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@ import {WebWorkerXHRImpl} from 'angular2/src/web_workers/worker/xhr_impl';
1616
import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url';
1717
import {WebWorkerRenderer} from './renderer';
1818
import {Renderer} from 'angular2/src/core/render/api';
19-
import {ClientMessageBrokerFactory} from 'angular2/src/web_workers/shared/client_message_broker';
19+
import {
20+
ClientMessageBrokerFactory,
21+
ClientMessageBrokerFactory_
22+
} from 'angular2/src/web_workers/shared/client_message_broker';
23+
import {
24+
ServiceMessageBrokerFactory,
25+
ServiceMessageBrokerFactory_
26+
} from 'angular2/src/web_workers/shared/service_message_broker';
2027
import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
2128
import {
2229
platformCommon,
@@ -90,7 +97,8 @@ function webWorkerBindings(appComponentType, bus: MessageBus, initData: {[key: s
9097
compilerBindings(),
9198
Serializer,
9299
bind(MessageBus).toValue(bus),
93-
ClientMessageBrokerFactory,
100+
bind(ClientMessageBrokerFactory).toClass(ClientMessageBrokerFactory_),
101+
bind(ServiceMessageBrokerFactory).toClass(ServiceMessageBrokerFactory_),
94102
WebWorkerRenderer,
95103
bind(Renderer).toAlias(WebWorkerRenderer),
96104
bind(ON_WEB_WORKER).toValue(true),

‎modules/examples/src/web_workers/message_broker/index_common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {Component, View, ServiceMessageBrokerFactory, PRIMITIVE} from "angular2/
33

44
const ECHO_CHANNEL = "ECHO";
55

6-
@Component({selector: 'app', viewBindings: [ServiceMessageBrokerFactory]})
6+
@Component({selector: 'app'})
77
@View({template: "<h1>WebWorker MessageBroker Test</h1>"})
88
export class App {
99
constructor(private _serviceBrokerFactory: ServiceMessageBrokerFactory) {

0 commit comments

Comments
 (0)
X Tutup