diff options
| author | Stephen Blott | 2015-05-17 09:03:05 +0100 |
|---|---|---|
| committer | Stephen Blott | 2015-05-17 09:03:08 +0100 |
| commit | 832be3c2059870e0930ece3ea88377034e237119 (patch) | |
| tree | d329881685c5162c1a9dd5ce3c43fed681337efb | |
| parent | 9ae3ef93a4c4e00081bae65bc3c23cf08b9cff9a (diff) | |
| download | vimium-832be3c2059870e0930ece3ea88377034e237119.tar.bz2 | |
TabToOpen: reactivate previous custom search engine.
Note: There's still an unpleasant flicker when this happens.
TBD: Fix this.
| -rw-r--r-- | background_scripts/completion.coffee | 4 | ||||
| -rw-r--r-- | pages/vomnibar.coffee | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee index be37a1fa..25c31be1 100644 --- a/background_scripts/completion.coffee +++ b/background_scripts/completion.coffee @@ -550,12 +550,12 @@ class SearchEngineCompleter return unless request.searchEngines engines = (engine for _, engine of request.searchEngines) engines.sort (a,b) -> b.searchUrl.length - a.searchUrl.length - engines.push insertTextPrefix: "", searchUrl: Settings.get "searchUrl" + engines.push insertTextPrefix: null, searchUrl: Settings.get "searchUrl" for suggestion in suggestions unless suggestion.isSearchSuggestion or suggestion.insertText for engine in engines if suggestion.insertText = Utils.extractQuery engine.searchUrl, suggestion.url - suggestion.insertText = "#{engine.insertTextPrefix}#{suggestion.insertText}" + suggestion.insertPrefixOnInput = engine.insertTextPrefix suggestion.title = suggestion.insertText suggestion.type = engine.description ? "search" break diff --git a/pages/vomnibar.coffee b/pages/vomnibar.coffee index 18ad5945..2caec140 100644 --- a/pages/vomnibar.coffee +++ b/pages/vomnibar.coffee @@ -195,11 +195,15 @@ class VomnibarUI updateOnInput: => @completer.cancel() + updateSynchronously = false + if 0 < @selection and @completions[@selection].insertPrefixOnInput + @input.value = @completions[@selection].insertPrefixOnInput + @input.value + updateSynchronously = true # If the user types, then don't reset any previous text, and reset the selection. if @previousInputValue? @previousInputValue = null @selection = -1 - @update false + @update updateSynchronously clearUpdateTimer: -> if @updateTimer? |