aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/compile.js
diff options
context:
space:
mode:
authorjankuca2013-09-25 15:35:50 -0700
committerJeff Cross2013-09-26 15:01:35 -0700
commit6a8edc1d43aca7c5a92f86309b1bb1d5f9968442 (patch)
tree111213bf971c191f72f17558bfdca7313d3ae06f /src/ng/compile.js
parent6cadabf910d86d72888b00db84989ba6d756ec88 (diff)
downloadangular.js-6a8edc1d43aca7c5a92f86309b1bb1d5f9968442.tar.bz2
fix($compile): collect ranges on multiple directives on one element
The problem was in keeping the values of `attrNameStart` and `attrNameEnd` between directive loop iterations which lead to the compiler looking for multi-element ranges for any directives that happened to be in the directive list after one that was applied on a range. For instance, having a ng-repeat-start and ng-class on a single element with ng-repeat being resolved first made the compiler look for an ng-repeat-end for both ng-repeat and ng-class because the `attrNameEnd` was not reset to a falsy value before the second iteration. As the result, an exception saying the block end element could not be found and the second directive was not actually applied. Closes #4002
Diffstat (limited to 'src/ng/compile.js')
-rw-r--r--src/ng/compile.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ng/compile.js b/src/ng/compile.js
index 1b251044..e44f33b7 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -621,8 +621,8 @@ function $CompileProvider($provide) {
// iterate over the attributes
for (var attr, name, nName, ngAttrName, value, nAttrs = node.attributes,
j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) {
- var attrStartName;
- var attrEndName;
+ var attrStartName = false;
+ var attrEndName = false;
var index;
attr = nAttrs[j];
@@ -633,11 +633,14 @@ function $CompileProvider($provide) {
if (NG_ATTR_BINDING.test(ngAttrName)) {
name = ngAttrName.substr(6).toLowerCase();
}
- if ((index = ngAttrName.lastIndexOf('Start')) != -1 && index == ngAttrName.length - 5) {
+
+ var directiveNName = ngAttrName.replace(/(Start|End)$/, '');
+ if (ngAttrName === directiveNName + 'Start') {
attrStartName = name;
attrEndName = name.substr(0, name.length - 5) + 'end';
name = name.substr(0, name.length - 6);
}
+
nName = directiveNormalize(name.toLowerCase());
attrsMap[nName] = name;
attrs[nName] = value = trim((msie && name == 'href')
@@ -712,6 +715,7 @@ function $CompileProvider($provide) {
} else {
nodes.push(node);
}
+
return jqLite(nodes);
}