mirror of
https://github.com/pawelmalak/flame.git
synced 2025-07-24 05:39:35 +02:00
Merge remote-tracking branch 'upstream/master' into merge_upstream_2-3-1
This commit is contained in:
commit
f9ee1d7ad5
13 changed files with 218 additions and 61 deletions
|
@ -4,6 +4,8 @@ import { store } from '../store/store';
|
|||
import searchQueries from './searchQueries.json';
|
||||
|
||||
export const searchParser = (searchQuery: string): SearchResult => {
|
||||
const queries = searchQueries.queries;
|
||||
|
||||
const result: SearchResult = {
|
||||
isLocal: false,
|
||||
isURL: false,
|
||||
|
@ -40,7 +42,7 @@ export const searchParser = (searchQuery: string): SearchResult => {
|
|||
|
||||
// Find primary search engine template
|
||||
const findProvider = (prefix: string) => {
|
||||
return [...searchQueries.queries, ...customQueries].find((q) => q.prefix === prefix);
|
||||
return [...queries, ...customQueries].find((q) => q.prefix === prefix);
|
||||
};
|
||||
|
||||
const primarySearch = findProvider(prefix);
|
||||
|
@ -53,10 +55,10 @@ export const searchParser = (searchQuery: string): SearchResult => {
|
|||
|
||||
if (prefix === 'l') {
|
||||
result.isLocal = true;
|
||||
} else {
|
||||
result.sameTab = config.searchSameTab;
|
||||
}
|
||||
|
||||
result.sameTab = config.searchSameTab;
|
||||
|
||||
if (secondarySearch) {
|
||||
result.secondarySearch = secondarySearch;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue