cargdev/angular
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(TemplateResolver): rename to ViewResolver

Browse Source
This commit is contained in:
Victor Berchet
2015-06-24 10:54:04 +02:00
parent 356c927d12
commit b15474c6f2
11 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/angular2/src/test_lib/test_bed.ts
View File

@ -7,7 +7,7 @@ import {List} from 'angular2/src/facade/collection';
import {View} from 'angular2/src/core/annotations_impl/view';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
import {AppView} from 'angular2/src/core/compiler/view';
import {internalView} from 'angular2/src/core/compiler/view_ref';
import {
@ -40,7 +40,7 @@ export class TestBed {
* @param {ViewDefinition} template
*/
overrideView(component: Type, template: View): void {
this._injector.get(TemplateResolver).setView(component, template);
this._injector.get(ViewResolver).setView(component, template);
}
/**
@ -51,7 +51,7 @@ export class TestBed {
* @param {string} html
*/
setInlineTemplate(component: Type, html: string): void {
this._injector.get(TemplateResolver).setInlineTemplate(component, html);
this._injector.get(ViewResolver).setInlineTemplate(component, html);
}
/**
@ -62,7 +62,7 @@ export class TestBed {
* @param {Type} to
*/
overrideDirective(component: Type, from: Type, to: Type): void {
this._injector.get(TemplateResolver).overrideViewDirective(component, from, to);
this._injector.get(ViewResolver).overrideViewDirective(component, from, to);
}
/**

10
modules/angular2/src/test_lib/test_component_builder.ts
View File

@ -6,7 +6,7 @@ import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
import {View} from 'angular2/src/core/annotations_impl/view';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
import {AppView} from 'angular2/src/core/compiler/view';
import {internalView} from 'angular2/src/core/compiler/view_ref';
import {
@ -127,15 +127,15 @@ export class TestComponentBuilder {
* @return {Promise<RootTestComponent>}
*/
createAsync(rootComponentType: Type): Promise<RootTestComponent> {
var mockTemplateResolver = this._injector.get(TemplateResolver);
var mockViewResolver = this._injector.get(ViewResolver);
MapWrapper.forEach(this._viewOverrides,
(view, type) => { mockTemplateResolver.setView(type, view); });
(view, type) => { mockViewResolver.setView(type, view); });
MapWrapper.forEach(this._templateOverrides, (template, type) => {
mockTemplateResolver.setInlineTemplate(type, template);
mockViewResolver.setInlineTemplate(type, template);
});
MapWrapper.forEach(this._directiveOverrides, (overrides, component) => {
MapWrapper.forEach(overrides, (to, from) => {
mockTemplateResolver.overrideViewDirective(component, from, to);
mockViewResolver.overrideViewDirective(component, from, to);
});
});

6
modules/angular2/src/test_lib/test_injector.ts
View File

@ -12,7 +12,7 @@ import {
} from 'angular2/change_detection';
import {ExceptionHandler} from 'angular2/src/core/exception_handler';
import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
import {ShadowDomStrategy} from 'angular2/src/render/dom/shadow_dom/shadow_dom_strategy';
@ -31,7 +31,7 @@ import {DOM} from 'angular2/src/dom/dom_adapter';
import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager';
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
import {MockXHR} from 'angular2/src/render/xhr_mock';
import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy';
import {LocationStrategy} from 'angular2/src/router/location_strategy';
@ -101,7 +101,7 @@ function _getAppBindings() {
bind(APP_VIEW_POOL_CAPACITY).toValue(500),
Compiler,
CompilerCache,
bind(TemplateResolver).toClass(MockTemplateResolver),
bind(ViewResolver).toClass(MockViewResolver),
bind(PipeRegistry).toValue(defaultPipeRegistry),
bind(ChangeDetection).toClass(DynamicChangeDetection),
ViewLoader,