[Search] Timeout length & indexed check

Changed timeout to 0 ms. Changed check for
already indexed to an empty return.
This commit is contained in:
slhale
2015-08-12 10:57:37 -07:00
parent 0520f1c70c
commit cab675c8ca

View File

@@ -39,13 +39,13 @@ define(
*
* @constructor
* @param $q Angular's $q, for promise consolidation.
* @param $timeout Angular's $timeout, for delayed funtion execution.
* @param $timeout Angular's $timeout, for delayed function execution.
* @param {ObjectService} objectService The service from which
* domain objects can be gotten.
* @param {WorkerService} workerService The service which allows
* more easy creation of web workers.
* @param {GENERIC_SEARCH_ROOTS[]} ROOTS An array of the root
* domain objects.
* @param {GENERIC_SEARCH_ROOTS} ROOTS An array of the root
* domain objects' IDs.
*/
function GenericSearchProvider($q, $timeout, objectService, workerService, ROOTS) {
var worker = workerService.run('genericSearchWorker'),
@@ -127,15 +127,18 @@ define(
nodes.forEach(function (node) {
var id = node && node.getId && node.getId();
// If we have not yet indexed this item, index it
if (!indexed[id]) {
// If we have already indexed this item, stop here
if (indexed[id]) {
return;
}
// Index each item with the web worker
indexItem(node);
indexed[id] = true;
if (node.hasCapability && node.hasCapability('composition')) {
// This node has children
// If this node has children, index those
if (node && node.hasCapability && node.hasCapability('composition')) {
// Make sure that this is async, so doesn't block up page
$timeout(function () {
// Get the children...
@@ -147,10 +150,9 @@ define(
} else {
indexItems([children]);
}
}, 100);
}, 0);
});
}, 100);
}
}, 0);
}
// Watch for changes to this item, in case it gets new children
@@ -192,7 +194,6 @@ define(
});
}
// For documentation, see query below
function query(input, timestamp, maxResults, timeout) {
var terms = [],