aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/parse.js
diff options
context:
space:
mode:
authorCaitlin Potter2014-01-07 16:41:54 -0500
committerCaitlin Potter2014-02-21 17:58:48 -0500
commit5fe1f39f027c6f2c6a530975dd5389d788d3c0eb (patch)
tree01e1ce824f01a03418d8ea74326e3998959c64fa /src/ng/parse.js
parent2bce71e9dc10c8588f9eb599a0cd2e831440fc48 (diff)
downloadangular.js-5fe1f39f027c6f2c6a530975dd5389d788d3c0eb.tar.bz2
fix($parse): reduce false-positives in isElement tests
There are always going to be false positives here, unfortunately. But testing different properties will hopefully reduce the number of false positives in a meaningful way, without harming performance too much. Closes #4805 Closes #5675
Diffstat (limited to 'src/ng/parse.js')
-rw-r--r--src/ng/parse.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ng/parse.js b/src/ng/parse.js
index 043be76c..bd3aa048 100644
--- a/src/ng/parse.js
+++ b/src/ng/parse.js
@@ -55,7 +55,7 @@ function ensureSafeObject(obj, fullExpression) {
'Referencing the Window in Angular expressions is disallowed! Expression: {0}',
fullExpression);
} else if (// isElement(obj)
- obj.children && (obj.nodeName || (obj.on && obj.find))) {
+ obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) {
throw $parseMinErr('isecdom',
'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}',
fullExpression);