Search completion; tweak timeouts and caching.

2 files changed, 7 insertions, 7 deletions

diff --git a/background_scripts/completion_engines.coffee b/background_scripts/completion_engines.coffee
index 3e762e32..19a18ecd 100644
--- a/background_scripts/completion_engines.coffee
+++ b/background_scripts/completion_engines.coffee
@@ -24,7 +24,7 @@ class RegexpEngine
 
 # Several Google completion engines package XML responses in this way.
 class GoogleXMLRegexpEngine extends RegexpEngine
-  doNotCache: true
+  doNotCache: false # true (disbaled, experimental)
   parse: (xhr) ->
     for suggestion in xhr.responseXML.getElementsByTagName "suggestion"
       continue unless suggestion = suggestion.getAttribute "data"
@@ -51,7 +51,7 @@ class Youtube extends GoogleXMLRegexpEngine
     "http://suggestqueries.google.com/complete/search?client=youtube&ds=yt&xml=t&q=#{Utils.createSearchQuery queryTerms}"
 
 class Wikipedia extends RegexpEngine
-  doNotCache: true
+  doNotCache: false # true (disbaled, experimental)
   # Example search URL: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s
   constructor: ->
     super [ new RegExp "^https?://[a-z]+\.wikipedia\.org/" ]
@@ -125,7 +125,7 @@ CompletionEngines =
 
   # The amount of time to wait for new requests before launching the HTTP request.  The intention is to cut
   # down on the number of HTTP requests we issue.
-  delay: 250
+  delay: 200
 
   get: (searchUrl, url, callback) ->
     xhr = new XMLHttpRequest()
@@ -177,9 +177,8 @@ CompletionEngines =
     @completionCache ?= new SimpleCache 60 * 60 * 1000, 2000 # One hour, 2000 entries.
     if @completionCache.has completionCacheKey
       # We add a short delay, even for a cache hit.  This avoids an ugly flicker when the additional
-      # suggestions are posted.  It also makes the vomnibar behave similarly regardless of whether there's a
-      # cache hit.
-      Utils.setTimeout @delay, =>
+      # suggestions are posted.
+      Utils.setTimeout 75, =>
         console.log "hit", completionCacheKey if @debug
         callback @completionCache.get completionCacheKey
       return
@@ -227,6 +226,7 @@ CompletionEngines =
           console.log "callbacks", queue.length, completionCacheKey if @debug and 0 < queue.length
           callback suggestions for callback in queue
 
+  # Cancel any pending (ie. blocked on @delay) queries.  Does not cancel in-flight queries.
   cancel: ->
     if @mostRecentHandler?
       @mostRecentHandler = null
diff --git a/pages/vomnibar.coffee b/pages/vomnibar.coffee
index ae61ca9d..62c37443 100644
--- a/pages/vomnibar.coffee
+++ b/pages/vomnibar.coffee
@@ -20,7 +20,7 @@ Vomnibar =
     extend options, userOptions
 
     options.refreshInterval =
-      if options.completer == "omni" then 125 else 0
+      if options.completer == "omni" then 100 else 0
 
     name = options.completer
     completer = @completers[name] ?= new BackgroundCompleter name