From 61ce82be4acae20562bb2ccb93ff64772ba553c1 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 20 Feb 2016 09:16:07 +0000
Subject: Refactor command-option parsing.

When we introduced command options (for mapping keys to custom-search
engines), the parsing was done in the Vomnibar code.

This moves the parsing to `commands.coffee`, which is where it should
always have been.

This is a preliminary step with a view to adding a new `count` command
option.
---
 content_scripts/vomnibar.coffee | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'content_scripts')

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.
-- 
cgit v1.2.3