Fix hasOwnProperty() calls in array functions

brettz9 · brettz9 · commit 712da4273e2d · 2010-03-19T21:35:38.000+08:00
diff --git a/functions/array/array_unique.js b/functions/array/array_unique.js
@@ -20,7 +20,7 @@ function array_unique (inputArr) {
     var __array_search = function (needle, haystack) {
         var fkey = '';
         for (fkey in haystack) {
-            if (haystack.hasOwnProperty) {
+            if (haystack.hasOwnProperty(fkey)) {
                 if ((haystack[fkey] + '') === (needle + '')) {
                     return fkey;
                 }
@@ -30,7 +30,7 @@ function array_unique (inputArr) {
     };
 
     for (key in inputArr) {
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(key)) {
             val = inputArr[key];
             if (false === __array_search(val, tmp_arr2)) {
                 tmp_arr2[key] = val;
diff --git a/functions/array/arsort.js b/functions/array/arsort.js
@@ -85,7 +85,7 @@ function arsort (inputArr, sort_flags) {
 
     // Get key and value arrays
     for (k in inputArr) {
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             keyArr.push(k);
             if (strictForIn) {
diff --git a/functions/array/asort.js b/functions/array/asort.js
@@ -88,7 +88,7 @@ function asort (inputArr, sort_flags) {
 
     // Get key and value arrays
     for (k in inputArr) {
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             keyArr.push(k);
             if (strictForIn) {
diff --git a/functions/array/krsort.js b/functions/array/krsort.js
@@ -56,7 +56,7 @@ function krsort (inputArr, sort_flags) {
 
     // Make a list of key names
     for (k in inputArr) {
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             keys.push(k);
         }
     }
@@ -80,7 +80,7 @@ function krsort (inputArr, sort_flags) {
         }
     }
     for (i in tmp_arr) {
-        if (tmp_arr.hasOwnProperty) {
+        if (tmp_arr.hasOwnProperty(i)) {
             populateArr[i] = tmp_arr[i];
         }
     }
diff --git a/functions/array/ksort.js b/functions/array/ksort.js
@@ -56,7 +56,7 @@ function ksort (inputArr, sort_flags) {
 
     // Make a list of key names
     for (k in inputArr) {
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             keys.push(k);
         }
     }
@@ -79,7 +79,7 @@ function ksort (inputArr, sort_flags) {
         }
     }
     for (i in tmp_arr) {
-        if (tmp_arr.hasOwnProperty) {
+        if (tmp_arr.hasOwnProperty(i)) {
             populateArr[i] = tmp_arr[i];
         }
     }
diff --git a/functions/array/natcasesort.js b/functions/array/natcasesort.js
@@ -47,7 +47,7 @@ function natcasesort (inputArr) {
 
     // Get key and value arrays
     for (k in inputArr) {
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             keyArr.push(k);
             if (strictForIn) {
diff --git a/functions/array/natsort.js b/functions/array/natsort.js
@@ -45,7 +45,7 @@ function natsort (inputArr) {
 
     // Get key and value arrays
     for (k in inputArr) {
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             keyArr.push(k);
             if (strictForIn) {
diff --git a/functions/array/rsort.js b/functions/array/rsort.js
@@ -64,7 +64,7 @@ function rsort (inputArr, sort_flags) {
     populateArr = strictForIn ? inputArr : populateArr;
 
     for (k in inputArr) { // Get key and value arrays
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             if (strictForIn) {
                 delete inputArr[k];
diff --git a/functions/array/shuffle.js b/functions/array/shuffle.js
@@ -25,7 +25,7 @@ function shuffle (inputArr) {
     var valArr = [], k = '', i = 0, strictForIn = false, populateArr = [];
 
     for (k in inputArr) { // Get key and value arrays
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             if (strictForIn) {
                 delete inputArr[k];
diff --git a/functions/array/sort.js b/functions/array/sort.js
@@ -64,7 +64,7 @@ function sort (inputArr, sort_flags) {
     populateArr = strictForIn ? inputArr : populateArr;
 
     for (k in inputArr) { // Get key and value arrays
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             if (strictForIn) {
                 delete inputArr[k];
diff --git a/functions/array/uasort.js b/functions/array/uasort.js
@@ -49,7 +49,7 @@ function uasort (inputArr, sorter) {
 
 
     for (k in inputArr) { // Get key and value arrays
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             keyArr.push(k);
             if (strictForIn) {
diff --git a/functions/array/uksort.js b/functions/array/uksort.js
@@ -25,7 +25,7 @@ function uksort (inputArr, sorter) {
 
     // Make a list of key names
     for (k in inputArr) {
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             keys.push(k);
         }
     }
@@ -59,7 +59,7 @@ function uksort (inputArr, sorter) {
         }
     }
     for (i in tmp_arr) {
-        if (tmp_arr.hasOwnProperty) {
+        if (tmp_arr.hasOwnProperty(i)) {
             populateArr[i] = tmp_arr[i];
         }
     }
diff --git a/functions/array/usort.js b/functions/array/usort.js
@@ -33,7 +33,7 @@ function usort (inputArr, sorter) {
     
 
     for (k in inputArr) { // Get key and value arrays
-        if (inputArr.hasOwnProperty) {
+        if (inputArr.hasOwnProperty(k)) {
             valArr.push(inputArr[k]);
             if (strictForIn) {
                 delete inputArr[k];
diff --git a/functions/xdiff/xdiff_string_patch.js b/functions/xdiff/xdiff_string_patch.js
@@ -2,8 +2,8 @@ function xdiff_string_patch (originalStr, patch, flags, error) {
     // http://kevin.vanzonneveld.net
     // +   original by: Brett Zamir (http://brett-zamir.me)
     // %        note 1: The XDIFF_PATCH_IGNORESPACE flag and the error argument are not currently supported
-    // %        note 1: This has not been widely tested
-    // *     example 1: xdiff_string_patch ('', '@@ -0,0 +1,1 @@\n+Hello world!');
+    // %        note 2: This has not been widely tested
+    // *     example 1: xdiff_string_patch('', '@@ -0,0 +1,1 @@\n+Hello world!');
     // *     returns 1: 'Hello world!'
 
     var i = 0, ll = 0, ranges = [], lastLinePos = 0, firstChar = '',

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function krsort (inputArr, sort_flags) {`
`56`	`56`
`57`	`57`	`// Make a list of key names`
`58`	`58`	`for (k in inputArr) {`
`59`		`- if (inputArr.hasOwnProperty) {`
	`59`	`+ if (inputArr.hasOwnProperty(k)) {`
`60`	`60`	`keys.push(k);`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -80,7 +80,7 @@ function krsort (inputArr, sort_flags) {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`for (i in tmp_arr) {`
`83`		`- if (tmp_arr.hasOwnProperty) {`
	`83`	`+ if (tmp_arr.hasOwnProperty(i)) {`
`84`	`84`	`populateArr[i] = tmp_arr[i];`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function ksort (inputArr, sort_flags) {`
`56`	`56`
`57`	`57`	`// Make a list of key names`
`58`	`58`	`for (k in inputArr) {`
`59`		`- if (inputArr.hasOwnProperty) {`
	`59`	`+ if (inputArr.hasOwnProperty(k)) {`
`60`	`60`	`keys.push(k);`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -79,7 +79,7 @@ function ksort (inputArr, sort_flags) {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`for (i in tmp_arr) {`
`82`		`- if (tmp_arr.hasOwnProperty) {`
	`82`	`+ if (tmp_arr.hasOwnProperty(i)) {`
`83`	`83`	`populateArr[i] = tmp_arr[i];`
`84`	`84`	`}`
`85`	`85`	`}`