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

fix(upgrade): allow functions for template and templateUrl (#9022)

Browse Source
This commit is contained in:
Rob Wormald
2016-06-04 19:53:51 -07:00
committed by Miško Hevery
parent 53083c0b52
commit a19c4e8f9a
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
View File

@ -133,9 +133,9 @@ export class UpgradeNg1ComponentAdapterBuilder {
compileTemplate(compile: angular.ICompileService, templateCache: angular.ITemplateCacheService,
httpBackend: angular.IHttpBackendService): Promise<any> {
if (this.directive.template !== undefined) {
this.linkFn = compileHtml(this.directive.template);
this.linkFn = compileHtml(typeof this.directive.template === 'function' ? this.directive.template() : this.directive.template);
} else if (this.directive.templateUrl) {
var url = this.directive.templateUrl;
var url = typeof this.directive.templateUrl === 'function' ? this.directive.templateUrl() : this.directive.templateUrl;
var html = templateCache.get(url);
if (html !== undefined) {
this.linkFn = compileHtml(html);