From 1debac63fcc71c88427da9b1ae450067c15cd2b2 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Fri, 1 May 2015 12:20:19 +0100 Subject: Rename SearchEngineCompleter to CustomSearchEngineCompleter. The name "SearchEngineCompleter" is more appropriate for completions actually delivered by a search engine. Also, what was SearchEngineCompleter is usually referred to as "custom search engines" elsewhere. --- background_scripts/settings.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index a4d95c81..a73a9d5c 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -33,7 +33,7 @@ root.Settings = Settings = root.refreshCompletionKeysAfterMappingSave() searchEngines: (value) -> - root.SearchEngineCompleter.parseSearchEngines value + root.CustomSearchEngineCompleter.parseSearchEngines value exclusionRules: (value) -> root.Exclusions.postUpdateHook value -- cgit v1.2.3 From 8329f3cbe95e6a39e500aa15e54c6c44fad9cb7e Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Sat, 2 May 2015 16:29:42 +0100 Subject: Search completion; refactor, add Youtube. Major refactoring. Unified tratment of custom search engines and general searches. --- background_scripts/settings.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index a73a9d5c..a4d95c81 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -33,7 +33,7 @@ root.Settings = Settings = root.refreshCompletionKeysAfterMappingSave() searchEngines: (value) -> - root.CustomSearchEngineCompleter.parseSearchEngines value + root.SearchEngineCompleter.parseSearchEngines value exclusionRules: (value) -> root.Exclusions.postUpdateHook value -- cgit v1.2.3 From 05431a5041913d78e44058e9e7f42ef9eee29ce9 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Sun, 3 May 2015 10:24:37 +0100 Subject: Search completion; Google maps. --- background_scripts/settings.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index a4d95c81..01277741 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -90,7 +90,11 @@ root.Settings = Settings = # default/fall back search engine searchUrl: "http://www.google.com/search?q=" # put in an example search engine - searchEngines: "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s wikipedia" + searchEngines: [ + "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia", "" + "t: http://www.youtube.com/results?search_query=%s Youtube", "" + "m: https://www.google.com/maps/search/%s Google Maps", "" + ].join "\n" newTabUrl: "chrome://newtab" grabBackFocus: false -- cgit v1.2.3 From 7ecc8805053cfe32549136412d16d5c62d6949c7 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Sun, 3 May 2015 11:21:06 +0100 Subject: Search completion; Google maps out, Amazon, Bing in. --- background_scripts/settings.coffee | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 01277741..06b59af8 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -91,10 +91,14 @@ root.Settings = Settings = searchUrl: "http://www.google.com/search?q=" # put in an example search engine searchEngines: [ - "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia", "" - "t: http://www.youtube.com/results?search_query=%s Youtube", "" - "m: https://www.google.com/maps/search/%s Google Maps", "" - ].join "\n" + # FIXME(smblott) Comment out these before merge. + "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia" + "t: http://www.youtube.com/results?search_query=%s Youtube" + "m: https://www.google.com/maps/search/%s Google Maps" + "b: https://www.bing.com/search?q=%s Bing" + "y: http://www.youtube.com/results?search_query=%s Youtube" + "az: http://www.amazon.com/s/?field-keywords=%s Amazon" + ].join "\n\n" newTabUrl: "chrome://newtab" grabBackFocus: false -- cgit v1.2.3 From 07a62680008b6c86b0cf8a12969334bd7c1e389c Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Sun, 3 May 2015 11:29:43 +0100 Subject: Search completion; DuckDuckGo. --- background_scripts/settings.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 06b59af8..07db3a89 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -91,11 +91,12 @@ root.Settings = Settings = searchUrl: "http://www.google.com/search?q=" # put in an example search engine searchEngines: [ - # FIXME(smblott) Comment out these before merge. + # FIXME(smblott) Comment these out before merge. "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia" "t: http://www.youtube.com/results?search_query=%s Youtube" "m: https://www.google.com/maps/search/%s Google Maps" "b: https://www.bing.com/search?q=%s Bing" + "d: https://duckduckgo.com/?q=%s DuckDuckGo" "y: http://www.youtube.com/results?search_query=%s Youtube" "az: http://www.amazon.com/s/?field-keywords=%s Amazon" ].join "\n\n" -- cgit v1.2.3 From 9de495ededee7f98504d6fe308ea73526956a7f3 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Mon, 4 May 2015 10:17:45 +0100 Subject: Search completion; hardwire search engines. These should be removed later. --- background_scripts/settings.coffee | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 07db3a89..b802937e 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -5,6 +5,8 @@ root = exports ? window root.Settings = Settings = get: (key) -> + # FIXME(smblott). Remove this line. + return @defaults.searchEngines if key == "searchEngines" if (key of localStorage) then JSON.parse(localStorage[key]) else @defaults[key] set: (key, value) -> @@ -92,6 +94,9 @@ root.Settings = Settings = # put in an example search engine searchEngines: [ # FIXME(smblott) Comment these out before merge. + "# THESE ARE HARD WIRED.\n# YOU CANNOT CHANGE THEM IN THIS VERSION.\n# FOR DEVELOPMENT ONLY." + "g: http://www.google.com/search?q=%s Google" + "l: http://www.google.com/search?q=%s&btnI I'm feeling lucky..." "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia" "t: http://www.youtube.com/results?search_query=%s Youtube" "m: https://www.google.com/maps/search/%s Google Maps" -- cgit v1.2.3 From 372e65d7b44c3f0ad3f522bd6b8c9cfacd693186 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Wed, 6 May 2015 07:32:19 +0100 Subject: Search completion; many tweaks and refactor Suggestion constructor. --- background_scripts/settings.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index b802937e..ce812970 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -98,11 +98,11 @@ root.Settings = Settings = "g: http://www.google.com/search?q=%s Google" "l: http://www.google.com/search?q=%s&btnI I'm feeling lucky..." "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia" - "t: http://www.youtube.com/results?search_query=%s Youtube" + "y: http://www.youtube.com/results?search_query=%s Youtube" + "t: http://www.youtube.com/results?search_query=%s" "m: https://www.google.com/maps/search/%s Google Maps" "b: https://www.bing.com/search?q=%s Bing" "d: https://duckduckgo.com/?q=%s DuckDuckGo" - "y: http://www.youtube.com/results?search_query=%s Youtube" "az: http://www.amazon.com/s/?field-keywords=%s Amazon" ].join "\n\n" newTabUrl: "chrome://newtab" -- cgit v1.2.3 From 4ab7881e46084a5946bae6d29fb1d0ab9677542a Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Fri, 8 May 2015 14:41:01 +0100 Subject: Search completion; fix unit tests. --- background_scripts/settings.coffee | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index ce812970..2a21b0c9 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -5,8 +5,6 @@ root = exports ? window root.Settings = Settings = get: (key) -> - # FIXME(smblott). Remove this line. - return @defaults.searchEngines if key == "searchEngines" if (key of localStorage) then JSON.parse(localStorage[key]) else @defaults[key] set: (key, value) -> @@ -93,18 +91,16 @@ root.Settings = Settings = searchUrl: "http://www.google.com/search?q=" # put in an example search engine searchEngines: [ - # FIXME(smblott) Comment these out before merge. - "# THESE ARE HARD WIRED.\n# YOU CANNOT CHANGE THEM IN THIS VERSION.\n# FOR DEVELOPMENT ONLY." - "g: http://www.google.com/search?q=%s Google" - "l: http://www.google.com/search?q=%s&btnI I'm feeling lucky..." "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia" - "y: http://www.youtube.com/results?search_query=%s Youtube" - "t: http://www.youtube.com/results?search_query=%s" - "m: https://www.google.com/maps/search/%s Google Maps" - "b: https://www.bing.com/search?q=%s Bing" - "d: https://duckduckgo.com/?q=%s DuckDuckGo" - "az: http://www.amazon.com/s/?field-keywords=%s Amazon" - ].join "\n\n" + "# Examples:" + "# g: http://www.google.com/search?q=%s Google" + "# l: http://www.google.com/search?q=%s&btnI I'm feeling lucky..." + "# y: http://www.youtube.com/results?search_query=%s Youtube" + "# m: https://www.google.com/maps/search/%s Google Maps" + "# b: https://www.bing.com/search?q=%s Bing" + "# d: https://duckduckgo.com/?q=%s DuckDuckGo" + "# az: http://www.amazon.com/s/?field-keywords=%s Amazon" + ].join "\n" newTabUrl: "chrome://newtab" grabBackFocus: false -- cgit v1.2.3 From 9887c8d763bf7b58e459a48f34531f6877ffebf4 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Fri, 8 May 2015 14:54:15 +0100 Subject: Search completion; tweak example text. --- background_scripts/settings.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 2a21b0c9..89b26bff 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -92,7 +92,9 @@ root.Settings = Settings = # put in an example search engine searchEngines: [ "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia" - "# Examples:" + "" + "# More examples:" + "#" "# g: http://www.google.com/search?q=%s Google" "# l: http://www.google.com/search?q=%s&btnI I'm feeling lucky..." "# y: http://www.youtube.com/results?search_query=%s Youtube" -- cgit v1.2.3 From 0c6b6e53d60a1c4b694d1515fdb7e43080bbf0d3 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Sat, 9 May 2015 16:53:41 +0100 Subject: Search completion; tweak default setting. --- background_scripts/settings.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 89b26bff..e5604b78 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -93,7 +93,9 @@ root.Settings = Settings = searchEngines: [ "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s Wikipedia" "" - "# More examples:" + "# More examples." + "#" + "# (Vimium has built-in completion for these.)" "#" "# g: http://www.google.com/search?q=%s Google" "# l: http://www.google.com/search?q=%s&btnI I'm feeling lucky..." -- cgit v1.2.3 From b332710f8395582809b1a1e2c436628b7f6e8c2a Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Sat, 9 May 2015 17:04:40 +0100 Subject: Search completion; tweak default setting. --- background_scripts/settings.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index e5604b78..44ed897d 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -100,10 +100,13 @@ root.Settings = Settings = "# g: http://www.google.com/search?q=%s Google" "# l: http://www.google.com/search?q=%s&btnI I'm feeling lucky..." "# y: http://www.youtube.com/results?search_query=%s Youtube" - "# m: https://www.google.com/maps/search/%s Google Maps" "# b: https://www.bing.com/search?q=%s Bing" "# d: https://duckduckgo.com/?q=%s DuckDuckGo" "# az: http://www.amazon.com/s/?field-keywords=%s Amazon" + "#" + "# Another example (for Vimium does not have completion)." + "#" + "# m: https://www.google.com/maps/search/%s Google Maps" ].join "\n" newTabUrl: "chrome://newtab" grabBackFocus: false -- cgit v1.2.3 From 313a1f96d666f23c2bc75ef340f0f828319e127c Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Sun, 10 May 2015 05:35:50 +0100 Subject: Search completion; refactor searchEngineCompleter. This revamps how search-engine configuration is handled, and revises some rather strange legacy code. --- background_scripts/settings.coffee | 3 --- 1 file changed, 3 deletions(-) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 44ed897d..11f492d7 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -32,9 +32,6 @@ root.Settings = Settings = root.Commands.parseCustomKeyMappings value root.refreshCompletionKeysAfterMappingSave() - searchEngines: (value) -> - root.SearchEngineCompleter.parseSearchEngines value - exclusionRules: (value) -> root.Exclusions.postUpdateHook value -- cgit v1.2.3 From 3975c13fe040639beb56582e50d951ad4839afbb Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Mon, 11 May 2015 14:37:57 +0100 Subject: Search completion; add weigthing option. --- background_scripts/settings.coffee | 1 + 1 file changed, 1 insertion(+) (limited to 'background_scripts/settings.coffee') diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 11f492d7..e042eded 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -43,6 +43,7 @@ root.Settings = Settings = # or strings defaults: scrollStepSize: 60 + omniSearchWeight: 0.6 smoothScroll: true keyMappings: "# Insert your preferred key mappings here." linkHintCharacters: "sadfjklewcmpgh" -- cgit v1.2.3