fix(upgrade): allow directives with empty template
This commit is contained in:
parent
b8e69a21a9
commit
2ca5e38a78
|
@ -120,7 +120,7 @@ export class UpgradeNg1ComponentAdapterBuilder {
|
||||||
|
|
||||||
compileTemplate(compile: angular.ICompileService, templateCache: angular.ITemplateCacheService,
|
compileTemplate(compile: angular.ICompileService, templateCache: angular.ITemplateCacheService,
|
||||||
httpBackend: angular.IHttpBackendService): Promise<any> {
|
httpBackend: angular.IHttpBackendService): Promise<any> {
|
||||||
if (this.directive.template) {
|
if (this.directive.template !== undefined) {
|
||||||
this.linkFn = compileHtml(this.directive.template);
|
this.linkFn = compileHtml(this.directive.template);
|
||||||
} else if (this.directive.templateUrl) {
|
} else if (this.directive.templateUrl) {
|
||||||
var url = this.directive.templateUrl;
|
var url = this.directive.templateUrl;
|
||||||
|
|
|
@ -304,6 +304,27 @@ export function main() {
|
||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
it('should support empty template', inject([AsyncTestCompleter], (async) => {
|
||||||
|
var adapter = new UpgradeAdapter();
|
||||||
|
var ng1Module = angular.module('ng1', []);
|
||||||
|
|
||||||
|
var ng1 = function() { return {template: ''}; };
|
||||||
|
ng1Module.directive('ng1', ng1);
|
||||||
|
var Ng2 = Component({
|
||||||
|
selector: 'ng2',
|
||||||
|
template: '<ng1></ng1>',
|
||||||
|
directives: [adapter.upgradeNg1Component('ng1')]
|
||||||
|
}).Class({constructor: function() {}});
|
||||||
|
ng1Module.directive('ng2', adapter.downgradeNg2Component(Ng2));
|
||||||
|
var element = html(`<div><ng2></ng2></div>`);
|
||||||
|
adapter.bootstrap(element, ['ng1'])
|
||||||
|
.ready((ref) => {
|
||||||
|
expect(multiTrim(document.body.textContent)).toEqual('');
|
||||||
|
ref.dispose();
|
||||||
|
async.done();
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
|
||||||
it('should support templateUrl fetched from $templateCache',
|
it('should support templateUrl fetched from $templateCache',
|
||||||
inject([AsyncTestCompleter], (async) => {
|
inject([AsyncTestCompleter], (async) => {
|
||||||
var adapter = new UpgradeAdapter();
|
var adapter = new UpgradeAdapter();
|
||||||
|
|
Loading…
Reference in New Issue