| ... |
... |
@@ -61,16 +61,22 @@ |
| 61 |
61 |
handleSearch(textSearch) { |
| 62 |
62 |
if(this.searchText !== "" || textSearch) { |
| 63 |
63 |
if(this.searchText !== this.prevSearchText) { |
| 64 |
|
- this.clearResults(); |
| 65 |
65 |
this.prevSearchText = this.searchText; |
| 66 |
66 |
this.fetchWikiSearch().then(results => { |
| 67 |
|
- this.resultsCache = results; |
| 68 |
|
- if(this.hasActiveFilters()) { |
| 69 |
|
- this.fetchFilterSearch().then(this.filterResults); |
| 70 |
|
- } else { |
| 71 |
|
- this.results = results; |
| 72 |
|
- } |
|
66 |
+ this.results = wikiSearchResults; |
|
67 |
+ this.resultsCache = wikiSearchResults; |
|
68 |
+ this.fetchFilterSearch().then(this.filterResults); |
| 73 |
73 |
}) |
|
70 |
+ /* |
|
71 |
+ Promise.all([ |
|
72 |
+ this.fetchWikiSearch(), |
|
73 |
+ this.fetchFilterSearch() |
|
74 |
+ ]).then(([wikiSearchResults, collabSearchResults]) => { |
|
75 |
+ this.results = wikiSearchResults; |
|
76 |
+ this.resultsCache = wikiSearchResults; |
|
77 |
+ console.log(wikiSearchResults, collabSearchResults); |
|
78 |
+ }); |
|
79 |
+ */ |
| 74 |
74 |
} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 75 |
75 |
this.fetchFilterSearch().then(this.filterResults) |
| 76 |
76 |
} else { |