diff options
| author | Igor Minar | 2013-02-11 12:25:34 -0800 |
|---|---|---|
| committer | Igor Minar | 2013-02-11 12:29:55 -0800 |
| commit | ec54712ff3dab1ade44f94fa82d67edeffa79a1d (patch) | |
| tree | 5d2445493fa56073a6231ca80c88ff4a6e2a56ba /src | |
| parent | 23dd78f8a463e03df77e505f445923d1946c9ecf (diff) | |
| download | angular.js-ec54712ff3dab1ade44f94fa82d67edeffa79a1d.tar.bz2 | |
fix(angular.forEach): correctly iterate over objects with length prop
Should handle JQLite, jQuery, NodeList and other objects like arrays
but not other generic objects or instances of user defined types
with length property.
Closes #1840
Diffstat (limited to 'src')
| -rw-r--r-- | src/Angular.js | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/Angular.js b/src/Angular.js index 2affd5ef..4685dbde 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -90,6 +90,30 @@ var /** holds major version number for IE or NaN for real browsers */ * @param {Object=} context Object to become context (`this`) for the iterator function. * @returns {Object|Array} Reference to `obj`. */ + + +/** + * @private + * @param {*} obj + * @return {boolean} Returns true if `obj` is an array or array-like object (NodeList, Arguments, ...) + */ +function isArrayLike(obj) { + if (!obj || (typeof obj.length !== 'number')) return false; + + // We have on object which has length property. Should we treat it as array? + if (typeof obj.hasOwnProperty != 'function' && + typeof obj.constructor != 'function') { + // This is here for IE8: it is a bogus object treat it as array; + return true; + } else { + return obj instanceof JQLite || // JQLite + (jQuery && obj instanceof jQuery) || // jQuery + toString.call(obj) !== '[object Object]' || // some browser native object + typeof obj.callee === 'function'; // arguments (on IE8 looks like regular obj) + } +} + + function forEach(obj, iterator, context) { var key; if (obj) { @@ -101,7 +125,7 @@ function forEach(obj, iterator, context) { } } else if (obj.forEach && obj.forEach !== forEach) { obj.forEach(iterator, context); - } else if (isObject(obj) && isNumber(obj.length)) { + } else if (isArrayLike(obj)) { for (key = 0; key < obj.length; key++) iterator.call(context, obj[key], key); } else { |
