From bcdbcd0ae908d213e15b8dec81e3f006cfb029a9 Mon Sep 17 00:00:00 2001 From: Kevin Kneifel Date: Wed, 5 Aug 2015 15:46:59 -0400 Subject: [PATCH] Replacing getIntersection method. Fixes fundamental error when matches only have one key, and that key value is less than the first key value in the ids array, which results in an empty intersection array. --- dist/bloodhound.js | 27 +++++++++++---------------- dist/typeahead.bundle.js | 27 +++++++++++---------------- src/bloodhound/search_index.js | 28 ++++++++++------------------ 3 files changed, 32 insertions(+), 50 deletions(-) diff --git a/dist/bloodhound.js b/dist/bloodhound.js index 6095f2915d..718dfe0787 100644 --- a/dist/bloodhound.js +++ b/dist/bloodhound.js @@ -523,23 +523,18 @@ } return uniques; } - function getIntersection(arrayA, arrayB) { - var ai = 0, bi = 0, intersection = []; - arrayA = arrayA.sort(); - arrayB = arrayB.sort(); - var lenArrayA = arrayA.length, lenArrayB = arrayB.length; - while (ai < lenArrayA && bi < lenArrayB) { - if (arrayA[ai] < arrayB[bi]) { - ai++; - } else if (arrayA[ai] > arrayB[bi]) { - bi++; - } else { - intersection.push(arrayA[ai]); - ai++; - bi++; - } + function getIntersection(array) { + var result = [], + argsLength = arguments.length; + for (var i = 0, length = array.length; i < length; i++) { + var item = array[i]; + if (result.indexOf(item) > -1) continue; + for (var j = 1; j < argsLength; j++) { + if (arguments[j].indexOf(item) === -1) break; + } + if (j === argsLength) result.push(item); } - return intersection; + return result; } }(); var Prefetch = function() { diff --git a/dist/typeahead.bundle.js b/dist/typeahead.bundle.js index bb0c8aeda6..7d25a9ae70 100644 --- a/dist/typeahead.bundle.js +++ b/dist/typeahead.bundle.js @@ -523,23 +523,18 @@ } return uniques; } - function getIntersection(arrayA, arrayB) { - var ai = 0, bi = 0, intersection = []; - arrayA = arrayA.sort(); - arrayB = arrayB.sort(); - var lenArrayA = arrayA.length, lenArrayB = arrayB.length; - while (ai < lenArrayA && bi < lenArrayB) { - if (arrayA[ai] < arrayB[bi]) { - ai++; - } else if (arrayA[ai] > arrayB[bi]) { - bi++; - } else { - intersection.push(arrayA[ai]); - ai++; - bi++; - } + function getIntersection(array) { + var result = [], + argsLength = arguments.length; + for (var i = 0, length = array.length; i < length; i++) { + var item = array[i]; + if (result.indexOf(item) > -1) continue; + for (var j = 1; j < argsLength; j++) { + if (arguments[j].indexOf(item) === -1) break; + } + if (j === argsLength) result.push(item); } - return intersection; + return result; } }(); var Prefetch = function() { diff --git a/src/bloodhound/search_index.js b/src/bloodhound/search_index.js index 84b8c6a0c7..f30323a40a 100644 --- a/src/bloodhound/search_index.js +++ b/src/bloodhound/search_index.js @@ -162,30 +162,22 @@ var SearchIndex = window.SearchIndex = (function() { return uniques; } - function getIntersection(arrayA, arrayB) { - var ai = 0, bi = 0, intersection = []; + function getIntersection(array) { + var result = [], + argsLength = arguments.length; - arrayA = arrayA.sort(); - arrayB = arrayB.sort(); + for (var i = 0, length = array.length; i < length; i++) { + var item = array[i]; - var lenArrayA = arrayA.length, lenArrayB = arrayB.length; + if (result.indexOf(item) > -1) continue; - while (ai < lenArrayA && bi < lenArrayB) { - if (arrayA[ai] < arrayB[bi]) { - ai++; + for (var j = 1; j < argsLength; j++) { + if (arguments[j].indexOf(item) === -1) break; } - else if (arrayA[ai] > arrayB[bi]) { - bi++; - } - - else { - intersection.push(arrayA[ai]); - ai++; - bi++; - } + if (j === argsLength) result.push(item); } - return intersection; + return result; } })();