diff options
| author | Stephen Blott | 2016-02-20 12:08:58 +0000 |
|---|---|---|
| committer | Stephen Blott | 2016-02-20 12:08:58 +0000 |
| commit | 2debf3e07ecc41e8d0c3c186f4d8ae39641426f4 (patch) | |
| tree | 834b61e967fc74ea2e43c7e1fbc51341f9542a43 /content_scripts | |
| parent | 5dc1a741a897400e64d68b8248c0557970d04a61 (diff) | |
| parent | c818edb5e0e1a1edbcccfb2b978bf2e535de9fb4 (diff) | |
| download | vimium-2debf3e07ecc41e8d0c3c186f4d8ae39641426f4.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'content_scripts')
| -rw-r--r-- | content_scripts/vomnibar.coffee | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/content_scripts/vomnibar.coffee b/content_scripts/vomnibar.coffee index 6c08ce92..55a46777 100644 --- a/content_scripts/vomnibar.coffee +++ b/content_scripts/vomnibar.coffee @@ -10,18 +10,7 @@ Vomnibar = options = {} searchEngines = Settings.get("searchEngines") ? "" SearchEngines.refreshAndUse searchEngines, (engines) -> - for option in registryEntry.options - [ key, value ] = option.split "=" - switch key - when "keyword" - if value? and engines[value]? - options.keyword = value - else - console.log "Vimium configuration error: no such custom search engine: #{option}." - else - console.log "Vimium configuration error: unused flag: #{option}." - - callback? options + callback? registryEntry.options # sourceFrameId here (and below) is the ID of the frame from which this request originates, which may be different # from the current frame. |