ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-16 14:18:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Search] Cleanup and documentation

Browse Source
This commit is contained in:
slhale
2015-08-18 16:08:16 -07:00
parent 3d1e1659c2
commit 9ebc04ef14
2 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
platform/search/src/controllers/SearchController.js
View File

@ -30,8 +30,8 @@ define(function () {
var INITIAL_LOAD_NUMBER = 20,
LOAD_INCREMENT = 20;
function SearchController($scope, searchService, types) {
// numResults is the starting amount of results to load. Will get increased.
function SearchController($scope, searchService) {
// numResults is the amount of results to display. Will get increased.
// fullResults holds the most recent complete searchService response object
var numResults = INITIAL_LOAD_NUMBER,
fullResults = {hits: []};
@ -46,7 +46,7 @@ define(function () {
// ngModel.filter, the function filter defined below
// ngModel.types, an array of type objects
// ngModel.checked, a dictionary of which type filter options are checked
// ngModel.checkAll, a boolean of whether all of the types in ngModel.checked are checked
// ngModel.checkAll, a boolean of whether to search all types
// ngModel.filtersString, a string list of what filters on the results are active
$scope.results = [];
$scope.loading = false;
@ -70,7 +70,7 @@ define(function () {
} else {
while (newResults.length < numResults && i < hits.length) {
// If this is of an acceptable type, add it to the list
if ($scope.ngModel.checked[hits[i].object.getModel().type] === true) {
if ($scope.ngModel.checked[hits[i].object.getModel().type]) {
newResults.push(fullResults.hits[i]);
}
i += 1;
@ -88,14 +88,12 @@ define(function () {
function search(maxResults) {
var inputText = $scope.ngModel.input;
// We are starting to load.
if (inputText !== '' && inputText !== undefined) {
// We are starting to load.
$scope.loading = true;
}
// Update whether the file tree should be displayed
// Hide tree only when starting search
if (inputText !== '' && inputText !== undefined) {
// Update whether the file tree should be displayed
// Hide tree only when starting search
$scope.ngModel.search = true;
}
@ -106,8 +104,9 @@ define(function () {
// Send the query
searchService.query(inputText, maxResults).then(function (result) {
// Store all the results before splicing off the front, so that
// we can load more to display later.
fullResults = result;
//$scope.results = result.hits.slice(0, numResults);
$scope.results = filter(result.hits);
// Update whether the file tree should be displayed