aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMisko Hevery2010-04-16 20:10:09 -0700
committerMisko Hevery2010-04-16 20:10:09 -0700
commit8394353b8580eadb9502abbcc963b594c9d9f53f (patch)
treecadca605b4bdbbdfc976323ecce4f00b216cb208 /src
parent6470b48ce022885551e83c9f5fd8a90fbc6ff80e (diff)
downloadangular.js-8394353b8580eadb9502abbcc963b594c9d9f53f.tar.bz2
bettor function iterator
Diffstat (limited to 'src')
-rw-r--r--src/Angular.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 87a2f3d6..ec1fa49b 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -36,14 +36,14 @@ function angularAlert(){
function foreach(obj, iterator, context) {
var key;
if (obj) {
- if (obj.forEach) {
- obj.forEach(iterator, context);
- } else if (isFunction(obj)){
+ if (isFunction(obj)){
for (key in obj) {
- if (key != 'prototype' && key != 'length' && key != 'name') {
+ if (key != 'prototype' && key != 'length' && key != 'name' && obj.hasOwnProperty(key)) {
iterator.call(context, obj[key], key);
}
}
+ } else if (obj.forEach) {
+ obj.forEach(iterator, context);
} else if (isObject(obj) && isNumber(obj.length)) {
for (key = 0; key < obj.length; key++)
iterator.call(context, obj[key], key);