Add more _.indexOf tests.

lodash · Jan 15, 2014 · ec6a840 · ec6a840
1 parent 9c571c7
commit ec6a840
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js
@@ -2382,12 +2382,12 @@
      * // => 2
      */
     function indexOf(array, value, fromIndex) {
+      var length = array ? array.length : 0;
       if (typeof fromIndex == 'number') {
-        var length = array ? array.length : 0;
         fromIndex = (fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex || 0);
       } else if (fromIndex) {
         var index = sortedIndex(array, value);
-        return array[index] === value ? index : -1;
+        return (length && array[index] === value) ? index : -1;
       }
       return baseIndexOf(array, value, fromIndex);
     }

diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js
diff --git a/dist/lodash.js b/dist/lodash.js
@@ -2081,12 +2081,12 @@
      * // => 2
      */
     function indexOf(array, value, fromIndex) {
+      var length = array ? array.length : 0;
       if (typeof fromIndex == 'number') {
-        var length = array ? array.length : 0;
         fromIndex = (fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex || 0);
       } else if (fromIndex) {
         var index = sortedIndex(array, value);
-        return array[index] === value ? index : -1;
+        return (length && array[index] === value) ? index : -1;
       }
       return baseIndexOf(array, value, fromIndex);
     }

diff --git a/dist/lodash.min.js b/dist/lodash.min.js
diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js
@@ -1130,12 +1130,12 @@
    * // => 2
    */
   function indexOf(array, value, fromIndex) {
+    var length = array ? array.length : 0;
     if (typeof fromIndex == 'number') {
-      var length = array ? array.length : 0;
       fromIndex = (fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex || 0);
     } else if (fromIndex) {
       var index = sortedIndex(array, value);
-      return array[index] === value ? index : -1;
+      return (length && array[index] === value) ? index : -1;
     }
     return baseIndexOf(array, value, fromIndex);
   }