+ Search completion is available for custom search engines whose search URL matches one of Vimium's
+ built-in completion engines. Search completion is not available for the default search engine.
+
+
+ Custom search engines are configured on the options page.
+
+ Available Completion Engines
+
+ The following completion engines are available.
+
+ {{{ENGINES}}}
+
+
+
+
+
--
cgit v1.2.3
From 01a6df1f155b8b068925cc813d663457edc860e8 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 31 May 2015 14:04:28 +0100
Subject: Re-write class with inheritence.
---
background_scripts/completion_engines.coffee | 14 +++++++-------
pages/completion_engines.coffee | 1 -
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/background_scripts/completion_engines.coffee b/background_scripts/completion_engines.coffee
index 9a88d491..48f94965 100644
--- a/background_scripts/completion_engines.coffee
+++ b/background_scripts/completion_engines.coffee
@@ -43,15 +43,15 @@ class Google extends GoogleXMLRegexpEngine
# A wrapper class for Google completions. This adds prefix terms to the query, and strips those terms from
# the resulting suggestions. For example, for Google Maps, we add "map of" as a prefix, then strip "map of"
# from the resulting suggestions.
-class GoogleWithPrefix
+class GoogleWithPrefix extends Google
constructor: (prefix, args...) ->
- @engine = new Google args...
- @prefix = "#{prefix.trim()} "
- @queryTerms = @prefix.split /\s+/
- match: (args...) -> @engine.match args...
- getUrl: (queryTerms) -> @engine.getUrl [ @queryTerms..., queryTerms... ]
+ super args...
+ prefix = prefix.trim()
+ @prefix = "#{prefix} "
+ @queryTerms = prefix.split /\s+/
+ getUrl: (queryTerms) -> super [ @queryTerms..., queryTerms... ]
parse: (xhr) ->
- @engine.parse(xhr)
+ super(xhr)
.filter (suggestion) => suggestion.startsWith @prefix
.map (suggestion) => suggestion[@prefix.length..].ltrim()
diff --git a/pages/completion_engines.coffee b/pages/completion_engines.coffee
index 38487200..8b137891 100644
--- a/pages/completion_engines.coffee
+++ b/pages/completion_engines.coffee
@@ -1,2 +1 @@
-console.log "hello"
--
cgit v1.2.3
From 4ce5022da5b79fe038f4c34dc27675b219d9f979 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 31 May 2015 15:02:37 +0100
Subject: Completion page; functional version.
---
pages/completion_engines.coffee | 19 +++++++++++++++++++
pages/completion_engines.css | 15 +++++++++++++++
pages/completion_engines.html | 14 ++++++++------
pages/options.css | 2 +-
pages/options.html | 5 +++--
5 files changed, 46 insertions(+), 9 deletions(-)
create mode 100644 pages/completion_engines.css
diff --git a/pages/completion_engines.coffee b/pages/completion_engines.coffee
index 8b137891..aa8bb6cc 100644
--- a/pages/completion_engines.coffee
+++ b/pages/completion_engines.coffee
@@ -1 +1,20 @@
+DomUtils.documentReady ->
+ html = ""
+ for engine in CompletionEngines[0...CompletionEngines.length-1]
+ engine = new engine
+ html += "
#{engine.constructor.name}
\n"
+ html += "
"
+ if engine.regexps
+ html += "
"
+ for re in engine.regexps
+ re = re.toString().replace(/^\//, '').replace /\/$/, ''
+ html += "#{re}\n"
+ html += "
"
+ if engine.prefix
+ html += "
This uses the general Google completion engine, but adds the prefix \"#{engine.prefix.trim()}\" to the query.
Search completion is available for custom search engines whose search URL matches one of Vimium's
- built-in completion engines. Search completion is not available for the default search engine.
+ built-in completion engines; that is, the search URL matches one of the regular expressions below.
+ Search completion is not available for the default search engine.
- Custom search engines are configured on the options page.
+ Custom search engines can be configured on the options
+ page.
+ Further information is available on the wiki.
Available Completion Engines
- The following completion engines are available.
-
- {{{ENGINES}}}
-
+
diff --git a/pages/options.css b/pages/options.css
index ffb348c6..282a523b 100644
--- a/pages/options.css
+++ b/pages/options.css
@@ -114,7 +114,7 @@ input#scrollStepSize, input#omniSearchWeight {
}
textarea#userDefinedLinkHintCss, textarea#keyMappings, textarea#searchEngines {
width: 100%;;
- min-height: 130px;
+ min-height: 140px;
white-space: nowrap;
}
input#previousPatterns, input#nextPatterns {
diff --git a/pages/options.html b/pages/options.html
index b14c454f..7b66efde 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -44,7 +44,7 @@ unmap j
unmapAll
" this is a comment
# this is also a comment
-