| ... |
... |
@@ -61,22 +61,16 @@ |
| 61 |
61 |
handleSearch(textSearch) { |
| 62 |
62 |
if(this.searchText !== "" || textSearch) { |
| 63 |
63 |
if(this.searchText !== this.prevSearchText) { |
|
64 |
+ this.clearResults(); |
| 64 |
64 |
this.prevSearchText = this.searchText; |
| 65 |
65 |
this.fetchWikiSearch().then(results => { |
| 66 |
|
- //this.results = results; |
| 67 |
67 |
this.resultsCache = results; |
| 68 |
|
- this.fetchFilterSearch().then(this.filterResults); |
|
68 |
+ if(this.hasActiveFilters()) { |
|
69 |
+ this.fetchFilterSearch().then(this.filterResults); |
|
70 |
+ } else { |
|
71 |
+ this.results = results; |
|
72 |
+ } |
| 69 |
69 |
}) |
| 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 |
|
- */ |
| 80 |
80 |
} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) { |
| 81 |
81 |
this.fetchFilterSearch().then(this.filterResults) |
| 82 |
82 |
} else { |