diff options
| -rw-r--r-- | background_scripts/completion.coffee | 16 | ||||
| -rw-r--r-- | background_scripts/main.coffee | 2 | ||||
| -rw-r--r-- | background_scripts/settings.coffee | 2 | ||||
| -rw-r--r-- | tests/unit_tests/completion_test.coffee | 4 | ||||
| -rw-r--r-- | tests/unit_tests/settings_test.coffee | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee index 6a1c0d30..21730c4e 100644 --- a/background_scripts/completion.coffee +++ b/background_scripts/completion.coffee @@ -322,7 +322,7 @@ class TabCompleter tabRecency.recencyScore(suggestion.tabId) # A completer which will return your search engines -class SearchEngineCompleter +class CustomSearchEngineCompleter searchEngines: {} filter: (queryTerms, onComplete) -> @@ -344,7 +344,7 @@ class SearchEngineCompleter computeRelevancy: -> 1 refresh: -> - @searchEngines = SearchEngineCompleter.getSearchEngines() + @searchEngines = CustomSearchEngineCompleter.getSearchEngines() getSearchEngineMatches: (queryTerms) -> (1 < queryTerms.length and @searchEngines[queryTerms[0]]) or {} @@ -353,9 +353,9 @@ class SearchEngineCompleter # mapping in @searchEnginesMap. @searchEnginesMap: null - # Parse the custom search engines setting and cache it in SearchEngineCompleter.searchEnginesMap. + # Parse the custom search engines setting and cache it in CustomSearchEngineCompleter.searchEnginesMap. @parseSearchEngines: (searchEnginesText) -> - searchEnginesMap = SearchEngineCompleter.searchEnginesMap = {} + searchEnginesMap = CustomSearchEngineCompleter.searchEnginesMap = {} for line in searchEnginesText.split /\n/ tokens = line.trim().split /\s+/ continue if tokens.length < 2 or tokens[0].startsWith('"') or tokens[0].startsWith("#") @@ -367,9 +367,9 @@ class SearchEngineCompleter # Fetch the search-engine map, building it if necessary. @getSearchEngines: -> - unless SearchEngineCompleter.searchEnginesMap? - SearchEngineCompleter.parseSearchEngines Settings.get "searchEngines" - SearchEngineCompleter.searchEnginesMap + unless CustomSearchEngineCompleter.searchEnginesMap? + CustomSearchEngineCompleter.parseSearchEngines Settings.get "searchEngines" + CustomSearchEngineCompleter.searchEnginesMap # A completer which calls filter() on many completers, aggregates the results, ranks them, and returns the top # 10. Queries from the vomnibar frontend script come through a multi completer. @@ -617,7 +617,7 @@ root.MultiCompleter = MultiCompleter root.HistoryCompleter = HistoryCompleter root.DomainCompleter = DomainCompleter root.TabCompleter = TabCompleter -root.SearchEngineCompleter = SearchEngineCompleter +root.CustomSearchEngineCompleter = CustomSearchEngineCompleter root.HistoryCache = HistoryCache root.RankingUtils = RankingUtils root.RegexpCache = RegexpCache diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee index 37c65592..353f0e53 100644 --- a/background_scripts/main.coffee +++ b/background_scripts/main.coffee @@ -47,7 +47,7 @@ completionSources = history: new HistoryCompleter() domains: new DomainCompleter() tabs: new TabCompleter() - seachEngines: new SearchEngineCompleter() + seachEngines: new CustomSearchEngineCompleter() completers = omni: new MultiCompleter([ 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 diff --git a/tests/unit_tests/completion_test.coffee b/tests/unit_tests/completion_test.coffee index 56fcc456..39437b52 100644 --- a/tests/unit_tests/completion_test.coffee +++ b/tests/unit_tests/completion_test.coffee @@ -239,10 +239,10 @@ context "search engines", setup -> searchEngines = "foo: bar?q=%s\n# comment\nbaz: qux?q=%s baz description" Settings.set 'searchEngines', searchEngines - @completer = new SearchEngineCompleter() + @completer = new CustomSearchEngineCompleter() # note, I couldn't just call @completer.refresh() here as I couldn't set root.Settings without errors # workaround is below, would be good for someone that understands the testing system better than me to improve - @completer.searchEngines = SearchEngineCompleter.getSearchEngines() + @completer.searchEngines = CustomSearchEngineCompleter.getSearchEngines() should "return search engine suggestion without description", -> results = filterCompleter(@completer, ["foo", "hello"]) diff --git a/tests/unit_tests/settings_test.coffee b/tests/unit_tests/settings_test.coffee index 346c98da..a67b69fa 100644 --- a/tests/unit_tests/settings_test.coffee +++ b/tests/unit_tests/settings_test.coffee @@ -73,7 +73,7 @@ context "settings", should "set search engines, retrieve them correctly and check that they have been parsed correctly", -> searchEngines = "foo: bar?q=%s\n# comment\nbaz: qux?q=%s baz description" Settings.set 'searchEngines', searchEngines - result = SearchEngineCompleter.getSearchEngines() + result = CustomSearchEngineCompleter.getSearchEngines() assert.equal Object.keys(result).length, 2 assert.equal "bar?q=%s", result["foo"].url assert.isFalse result["foo"].description |