aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2012-08-10 23:46:42 -0700
committerIgor Minar2012-08-13 09:48:23 -0700
commit0f37194fb7ce67c3719626d9e21d95a66538a0e4 (patch)
treeed8b30f93eb4bf5f702bd24060934d8d99df806f
parente85774f709b9f681b0ff8d829b07568b0f844a62 (diff)
downloadangular.js-0f37194fb7ce67c3719626d9e21d95a66538a0e4.tar.bz2
refactor($compile): code cleanup
-rw-r--r--src/ng/compile.js10
-rw-r--r--test/ng/compileSpec.js3
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ng/compile.js b/src/ng/compile.js
index 31c1696c..56dafc39 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -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);
}
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
index 31a83648..cbf84a38 100644
--- a/test/ng/compileSpec.js
+++ b/test/ng/compileSpec.js
@@ -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);
- }
+ }
}));
}));