refactor($compile): code cleanup

This commit is contained in:
Igor Minar 2012-08-10 23:46:42 -07:00
parent d010e0cc7d
commit ab044cada6
2 changed files with 7 additions and 6 deletions

View file

@ -576,14 +576,16 @@ function $CompileProvider($provide) {
}
}
if (directiveValue = directive.template) {
if ((directiveValue = directive.template)) {
assertNoDuplicate('template', templateDirective, directive, $compileNode);
templateDirective = directive;
$template = jqLite('<div>' + trim(directiveValue) + '</div>').contents();
compileNode = $template[0];
if (directive.replace) {
$template = jqLite('<div>' +
trim(directiveValue) +
'</div>').contents();
compileNode = $template[0];
if ($template.length != 1 || compileNode.nodeType !== 1) {
throw new Error(MULTI_ROOT_TEMPLATE_ERROR + directiveValue);
}

View file

@ -369,7 +369,6 @@ describe('$compile', function() {
describe('template', function() {
beforeEach(module(function() {
directive('replace', valueFn({
restrict: 'CAM',
@ -394,7 +393,7 @@ describe('$compile', function() {
compile: function(element, attr) {
attr.$set('compiled', 'COMPILED');
expect(element).toBe(attr.$$element);
}
}
}));
}));