| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -129,7 +129,6 @@ | |||
| 129 | 129 | "mdi-react": "^4.0.0", | |
| 130 | 130 | "mermaid": "^8.0.0-rc.8", | |
| 131 | 131 | "node-sass-import-once": "^1.2.0", | |
| 132 | - "omnicli": "0.1.13", | ||
| 133 | 132 | "open-color": "^1.6.3", | |
| 134 | 133 | "react": "^16.4.2", | |
| 135 | 134 | "react-dom": "^16.4.2", | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,45 +1,15 @@ | |||
| 1 | - import * as OmniCLI from 'omnicli' | ||
| 2 | - | ||
| 3 | - import configCommands from './config' | ||
| 4 | - import { featureFlagsCommand, toggleFeatureFlagsCommand } from './featureFlags' | ||
| 5 | - import fileCommand from './file' | ||
| 1 | + import * as omnibox from '../../browser/omnibox' | ||
| 6 | 2 | import searchCommand from './search' | |
| 7 | 3 | ||
| 8 | - const commands: OmniCLI.Command[] = [...configCommands, fileCommand, featureFlagsCommand, toggleFeatureFlagsCommand] | ||
| 9 | - | ||
| 10 | - const searchCli = OmniCLI.createCli({ commands: [searchCommand] }) | ||
| 11 | - | ||
| 12 | - const cli = OmniCLI.createCli({ | ||
| 13 | - commands, | ||
| 14 | - prefix: ':', | ||
| 15 | - }) | ||
| 16 | - | ||
| 17 | - interface InitOptions { | ||
| 18 | - onInputEntered: (fn: (text: string, disposition: string) => void) => void | ||
| 19 | - onInputChanged: (fn: (text: string, suggest: (suggestions: OmniCLI.Suggestion[]) => void) => void) => void | ||
| 20 | - } | ||
| 21 | - | ||
| 22 | - export default function initialize({ onInputEntered, onInputChanged }: InitOptions): void { | ||
| 4 | + export default function initialize({ onInputEntered, onInputChanged }: typeof omnibox): void { | ||
| 23 | 5 | onInputChanged((query, suggest) => { | |
| 24 | - if (cli.hasPrefix(query)) { | ||
| 25 | - cli.onInputChanged(query) | ||
| 26 | - .then(suggest) | ||
| 27 | - .catch(err => console.error('error getting suggestions', err)) | ||
| 28 | - return | ||
| 29 | - } | ||
| 30 | - | ||
| 31 | - searchCli | ||
| 32 | - .onInputChanged(query) | ||
| 6 | + searchCommand | ||
| 7 | + .getSuggestions(query) | ||
| 33 | 8 | .then(suggest) | |
| 34 | 9 | .catch(err => console.error('error getting suggestions', err)) | |
| 35 | 10 | }) | |
| 36 | 11 | ||
| 37 | 12 | onInputEntered((query, disposition) => { | |
| 38 | - if (cli.hasPrefix(query)) { | ||
| 39 | - cli.onInputEntered(query, disposition) | ||
| 40 | - return | ||
| 41 | - } | ||
| 42 | - | ||
| 43 | - searchCli.onInputEntered(query, disposition) | ||
| 13 | + searchCommand.action(query, disposition) | ||
| 44 | 14 | }) | |
| 45 | 15 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,4 @@ | |||
| 1 | 1 | import { first } from 'lodash' | |
| 2 | - import * as OmniCLI from 'omnicli' | ||
| 3 | 2 | ||
| 4 | 3 | import storage from '../../browser/storage' | |
| 5 | 4 | import * as tabs from '../../browser/tabs' | |
@@ -10,18 +9,15 @@ import { buildSearchURLQuery } from '../../shared/util/url' | |||
| 10 | 9 | ||
| 11 | 10 | const isURL = /^https?:\/\// | |
| 12 | 11 | ||
| 13 | - class SearchCommand implements OmniCLI.Command { | ||
| 14 | - public name = OmniCLI.DEFAULT_NAME | ||
| 12 | + class SearchCommand { | ||
| 15 | 13 | public description = 'Enter a search query' | |
| 16 | 14 | ||
| 17 | 15 | private suggestionFetcher = createSuggestionFetcher(20) | |
| 18 | 16 | ||
| 19 | - private prev: { query: string; suggestions: OmniCLI.Suggestion[] } = { query: '', suggestions: [] } | ||
| 17 | + private prev: { query: string; suggestions: chrome.omnibox.Suggestion[] } = { query: '', suggestions: [] } | ||
| 20 | 18 | ||
| 21 | - public getSuggestions = (args: string[]): Promise<OmniCLI.Suggestion[]> => { | ||
| 22 | - const query = args.join(' ') | ||
| 23 | - | ||
| 24 | - return new Promise(resolve => { | ||
| 19 | + public getSuggestions = (query: string): Promise<chrome.omnibox.Suggestion[]> => | ||
| 20 | + new Promise(resolve => { | ||
| 25 | 21 | if (this.prev.query === query) { | |
| 26 | 22 | resolve(this.prev.suggestions) | |
| 27 | 23 | return | |
@@ -44,11 +40,8 @@ class SearchCommand implements OmniCLI.Command { | |||
| 44 | 40 | }, | |
| 45 | 41 | }) | |
| 46 | 42 | }) | |
| 47 | - } | ||
| 48 | - | ||
| 49 | - public action = (args: string[], disposition?: string): void => { | ||
| 50 | - const query = args.join(' ') | ||
| 51 | 43 | ||
| 44 | + public action = (query: string, disposition?: string): void => { | ||
| 52 | 45 | storage.getSync(({ serverUrls, sourcegraphURL }) => { | |
| 53 | 46 | const url = sourcegraphURL || first(serverUrls) | |
| 54 | 47 | const props = { | |
| Back | FazBrowse Home | New Git URL |
0 commit comments