kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-23 11:37:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

correct size() impl for object's w/ 'length' prop

Browse Source 
the original implementation returned incorrect value value for
objects with 'length' property.
This commit is contained in:
Igor Minar
2011-03-27 16:19:03 -07:00
parent 96a1df192a
commit a4863d5244
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Angular.js
View File

@@ -487,17 +487,19 @@ function map(obj, iterator, context) {
*/
function size(obj, ownPropsOnly) {
var size = 0, key;
if (obj) {
if (isNumber(obj.length)) {
return obj.length;
} else if (isObject(obj)){
for (key in obj)
if (!ownPropsOnly || obj.hasOwnProperty(key))
size++;
}
if (isArray(obj) || isString(obj)) {
return obj.length;
} else if (isObject(obj)){
for (key in obj)
if (!ownPropsOnly || obj.hasOwnProperty(key))
size++;
}
return size;
}
function includes(array, obj) {
for ( var i = 0; i < array.length; i++) {
if (obj === array[i]) return true;