Skip to content

Commit 356c927

Browse files
vicbvicb
committed
refactor(TemplateLoader): rename to ViewLoader
1 parent b89c067 commit 356c927

File tree

11 files changed

+28
-36
lines changed

11 files changed

+28
-36
lines changed

‎modules/angular2/render.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* This module provides advanced support for extending dom strategy.
66
*/
77

8-
export * from './src/render/dom/compiler/template_loader';
8+
export * from './src/render/dom/compiler/view_loader';
99
export * from './src/render/dom/shadow_dom/shadow_dom_strategy';
1010
export * from './src/render/dom/shadow_dom/native_shadow_dom_strategy';
1111
export * from './src/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy';

‎modules/angular2/src/core/application.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
defaultPipeRegistry
2525
} from 'angular2/change_detection';
2626
import {ExceptionHandler} from './exception_handler';
27-
import {TemplateLoader} from 'angular2/src/render/dom/compiler/template_loader';
27+
import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader';
2828
import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver';
2929
import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner';
3030
import {TemplateResolver} from './compiler/template_resolver';
@@ -121,7 +121,7 @@ function _injectorBindings(appComponentType): List<Type | Binding | List<any>> {
121121
TemplateResolver,
122122
bind(PipeRegistry).toValue(defaultPipeRegistry),
123123
bind(ChangeDetection).toClass(bestChangeDetection),
124-
TemplateLoader,
124+
ViewLoader,
125125
DirectiveResolver,
126126
Parser,
127127
Lexer,

‎modules/angular2/src/render/dom/compiler/compiler.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
RenderProtoViewRef
1414
} from '../../api';
1515
import {CompilePipeline} from './compile_pipeline';
16-
import {TemplateLoader} from 'angular2/src/render/dom/compiler/template_loader';
16+
import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader';
1717
import {CompileStepFactory, DefaultStepFactory} from './compile_step_factory';
1818
import {Parser} from 'angular2/change_detection';
1919
import {ShadowDomStrategy} from '../shadow_dom/shadow_dom_strategy';
@@ -24,12 +24,10 @@ import {ShadowDomStrategy} from '../shadow_dom/shadow_dom_strategy';
2424
* the CompilePipeline and the CompileSteps.
2525
*/
2626
export class DomCompiler extends RenderCompiler {
27-
constructor(public _stepFactory: CompileStepFactory, public _templateLoader: TemplateLoader) {
28-
super();
29-
}
27+
constructor(public _stepFactory: CompileStepFactory, public _viewLoader: ViewLoader) { super(); }
3028

3129
compile(view: ViewDefinition): Promise<ProtoViewDto> {
32-
var tplPromise = this._templateLoader.load(view);
30+
var tplPromise = this._viewLoader.load(view);
3331
return PromiseWrapper.then(
3432
tplPromise, (el) => this._compileTemplate(view, el, ViewType.COMPONENT), (e) => {
3533
throw new BaseException(`Failed to load the template for "${view.componentId}" : ${e}`);
@@ -59,8 +57,7 @@ export class DomCompiler extends RenderCompiler {
5957

6058
@Injectable()
6159
export class DefaultDomCompiler extends DomCompiler {
62-
constructor(parser: Parser, shadowDomStrategy: ShadowDomStrategy,
63-
templateLoader: TemplateLoader) {
64-
super(new DefaultStepFactory(parser, shadowDomStrategy), templateLoader);
60+
constructor(parser: Parser, shadowDomStrategy: ShadowDomStrategy, viewLoader: ViewLoader) {
61+
super(new DefaultStepFactory(parser, shadowDomStrategy), viewLoader);
6562
}
6663
}

‎modules/angular2/src/render/dom/compiler/template_loader.ts‎ renamed to ‎modules/angular2/src/render/dom/compiler/view_loader.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {StyleUrlResolver} from './style_url_resolver';
1616
* TODO: Make public API once we are more confident in this approach.
1717
*/
1818
@Injectable()
19-
export class TemplateLoader {
19+
export class ViewLoader {
2020
_cache: Map<string, Promise<string>> = new Map();
2121

2222
constructor(private _xhr: XHR, private _styleInliner: StyleInliner,

‎modules/angular2/src/test_lib/test_injector.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
defaultPipeRegistry
1212
} from 'angular2/change_detection';
1313
import {ExceptionHandler} from 'angular2/src/core/exception_handler';
14-
import {TemplateLoader} from 'angular2/src/render/dom/compiler/template_loader';
14+
import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader';
1515
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
1616
import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
1717
import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
@@ -104,7 +104,7 @@ function _getAppBindings() {
104104
bind(TemplateResolver).toClass(MockTemplateResolver),
105105
bind(PipeRegistry).toValue(defaultPipeRegistry),
106106
bind(ChangeDetection).toClass(DynamicChangeDetection),
107-
TemplateLoader,
107+
ViewLoader,
108108
DynamicComponentLoader,
109109
DirectiveResolver,
110110
Parser,

‎modules/angular2/src/transform/template_compiler/generator.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:angular2/src/render/api.dart';
99
import 'package:angular2/src/render/dom/compiler/compile_pipeline.dart';
1010
import 'package:angular2/src/render/dom/compiler/style_inliner.dart';
1111
import 'package:angular2/src/render/dom/compiler/style_url_resolver.dart';
12-
import 'package:angular2/src/render/dom/compiler/template_loader.dart';
12+
import 'package:angular2/src/render/dom/compiler/view_loader.dart';
1313
import 'package:angular2/src/render/xhr.dart' show XHR;
1414
import 'package:angular2/src/reflection/reflection.dart';
1515
import 'package:angular2/src/services/url_resolver.dart';
@@ -81,7 +81,7 @@ Future<String> processTemplates(AssetReader reader, AssetId entryPoint,
8181
/// reflectively accessed from that template.
8282
class _TemplateExtractor {
8383
final CompileStepFactory _factory;
84-
TemplateLoader _loader;
84+
ViewLoader _loader;
8585

8686
_TemplateExtractor(XHR xhr)
8787
: _factory = new CompileStepFactory(new ng.Parser(new ng.Lexer())) {
@@ -90,7 +90,7 @@ class _TemplateExtractor {
9090
var styleUrlResolver = new StyleUrlResolver(urlResolver);
9191
var styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver);
9292

93-
_loader = new TemplateLoader(xhr, styleInliner, styleUrlResolver);
93+
_loader = new ViewLoader(xhr, styleInliner, styleUrlResolver);
9494
}
9595

9696
Future<_ExtractResult> extractTemplates(ViewDefinition viewDef) async {

‎modules/angular2/test/core/compiler/compiler_spec.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ export function main() {
133133
cmpUrlMapper.setComponentUrl(MainComponent, '/cmp/main.js');
134134
captureTemplate(new viewAnn.View({templateUrl: 'tpl/main.html'}))
135135
.then((renderTpl) => {
136-
expect(renderTpl.templateAbsUrl)
137-
.toEqual('http://www.app.com/cmp/tpl/main.html');
136+
expect(renderTpl.templateAbsUrl).toEqual('http://www.app.com/cmp/tpl/main.html');
138137
async.done();
139138
});
140139
}));
@@ -144,10 +143,8 @@ export function main() {
144143
captureTemplate(new viewAnn.View({styleUrls: ['css/1.css', 'css/2.css']}))
145144
.then((renderTpl) => {
146145
expect(renderTpl.styleAbsUrls)
147-
.toEqual([
148-
'http://www.app.com/cmp/css/1.css',
149-
'http://www.app.com/cmp/css/2.css'
150-
]);
146+
.toEqual(
147+
['http://www.app.com/cmp/css/1.css', 'http://www.app.com/cmp/css/2.css']);
151148
async.done();
152149
});
153150
}));

‎modules/angular2/test/render/dom/compiler/compiler_common_tests.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {CompileElement} from 'angular2/src/render/dom/compiler/compile_element';
2222
import {CompileStep} from 'angular2/src/render/dom/compiler/compile_step';
2323
import {CompileStepFactory} from 'angular2/src/render/dom/compiler/compile_step_factory';
2424
import {CompileControl} from 'angular2/src/render/dom/compiler/compile_control';
25-
import {TemplateLoader} from 'angular2/src/render/dom/compiler/template_loader';
25+
import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader';
2626

2727
import {resolveInternalDomProtoView} from 'angular2/src/render/dom/view/proto_view';
2828

@@ -34,7 +34,7 @@ export function runCompilerCommonTests() {
3434
if (isBlank(urlData)) {
3535
urlData = new Map();
3636
}
37-
var tplLoader = new FakeTemplateLoader(urlData);
37+
var tplLoader = new FakeViewLoader(urlData);
3838
mockStepFactory = new MockStepFactory([new MockStep(processClosure)]);
3939
return new DomCompiler(mockStepFactory, tplLoader);
4040
}
@@ -168,7 +168,7 @@ var EMPTY_STEP = (parent, current, control) => {
168168
}
169169
};
170170

171-
class FakeTemplateLoader extends TemplateLoader {
171+
class FakeViewLoader extends ViewLoader {
172172
_urlData: Map<string, string>;
173173
constructor(urlData) {
174174
super(null, null, null);

‎modules/angular2/test/render/dom/compiler/style_url_resolver_spec.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ export function main() {
77
describe('StyleUrlResolver', () => {
88
let styleUrlResolver;
99

10-
beforeEach(() => {
11-
styleUrlResolver = new StyleUrlResolver(new UrlResolver());
12-
});
10+
beforeEach(() => { styleUrlResolver = new StyleUrlResolver(new UrlResolver()); });
1311

1412
it('should resolve "url()" urls', () => {
1513
var css = `

‎modules/angular2/test/render/dom/compiler/template_loader_spec.ts‎ renamed to ‎modules/angular2/test/render/dom/compiler/view_loader_spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
xit,
1212
} from 'angular2/test_lib';
1313
import {DOM} from 'angular2/src/dom/dom_adapter';
14-
import {TemplateLoader} from 'angular2/src/render/dom/compiler/template_loader';
14+
import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader';
1515
import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner';
1616
import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver';
1717
import {UrlResolver} from 'angular2/src/services/url_resolver';
@@ -23,15 +23,15 @@ import {XHR} from 'angular2/src/render/xhr';
2323
import {MockXHR} from 'angular2/src/render/xhr_mock';
2424

2525
export function main() {
26-
describe('TemplateLoader', () => {
26+
describe('ViewLoader', () => {
2727
var loader, xhr, styleUrlResolver, urlResolver;
2828

2929
beforeEach(() => {
3030
xhr = new MockXHR();
3131
urlResolver = new UrlResolver();
3232
styleUrlResolver = new StyleUrlResolver(urlResolver);
3333
let styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver);
34-
loader = new TemplateLoader(xhr, styleInliner, styleUrlResolver);
34+
loader = new ViewLoader(xhr, styleInliner, styleUrlResolver);
3535
});
3636

3737
describe('html', () => {
@@ -71,7 +71,7 @@ export function main() {
7171
xhr.reply('http://ng.io/foo.css', '/* foo.css */');
7272

7373
let styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver);
74-
let loader = new TemplateLoader(xhr, styleInliner, styleUrlResolver);
74+
let loader = new ViewLoader(xhr, styleInliner, styleUrlResolver);
7575

7676
var view = new ViewDefinition({templateAbsUrl: 'http://ng.io/foo.html'});
7777
loader.load(view).then((el) => {
@@ -168,7 +168,7 @@ export function main() {
168168
xhr.reply('http://ng.io/foo.css', '/* foo.css */');
169169

170170
let styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver);
171-
let loader = new TemplateLoader(xhr, styleInliner, styleUrlResolver);
171+
let loader = new ViewLoader(xhr, styleInliner, styleUrlResolver);
172172

173173
var view = new ViewDefinition(
174174
{templateAbsUrl: 'http://ng.io/foo.html', styles: ['@import "foo.css";']});

0 commit comments

Comments
 (0)