alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Search] Timeout length & indexed check

Browse Source 
Changed timeout to 0 ms. Changed check for
already indexed to an empty return.
This commit is contained in:
slhale
2015-08-12 11:03:10 -07:00
parent 3555f41f3e
commit 515470fa6a
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
platform/search/src/services/GenericSearchProvider.js
View File

@@ -39,7 +39,7 @@ define(
* *
* @constructor * @constructor
* @param $q Angular's $q, for promise consolidation. * @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 * @param {ObjectService} objectService The service from which
* domain objects can be gotten. * domain objects can be gotten.
* @param {WorkerService} workerService The service which allows * @param {WorkerService} workerService The service which allows
@@ -127,30 +127,32 @@ define(
nodes.forEach(function (node) { nodes.forEach(function (node) {
var id = node && node.getId && node.getId(); var id = node && node.getId && node.getId();
// If we have not yet indexed this item, index it // If we have already indexed this item, stop here
if (!indexed[id]) { if (indexed[id]) {
// Index each item with the web worker return;
indexItem(node); }
indexed[id] = true;
// Index each item with the web worker
if (node && node.hasCapability && node.hasCapability('composition')) { indexItem(node);
// This node has children indexed[id] = true;
// Make sure that this is async, so doesn't block up page
$timeout(function () { // If this node has children, index those
// Get the children... if (node && node.hasCapability && node.hasCapability('composition')) {
node.useCapability('composition').then(function (children) { // Make sure that this is async, so doesn't block up page
$timeout(function () { $timeout(function () {
// ... then index the children // Get the children...
if (children.constructor === Array) { node.useCapability('composition').then(function (children) {
indexItems(children); $timeout(function () {
} else { // ... then index the children
indexItems([children]); if (children.constructor === Array) {
} indexItems(children);
}, 100); } else {
}); indexItems([children]);
}, 100); }
} }, 0);
});
}, 0);
} }
// Watch for changes to this item, in case it gets new children // Watch for changes to this item, in case it gets new children