mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-17 22:32:51 +00:00
Backed out changeset ed42b5ee3c94 (bug 1096248) for bc-1 test failures
This commit is contained in:
parent
8d08f416df
commit
75e5b5aa12
toolkit/components/places
@ -22,7 +22,6 @@ const PREF_ENABLED = [ "autocomplete.enabled", true ];
|
||||
const PREF_AUTOFILL = [ "autoFill", true ];
|
||||
const PREF_AUTOFILL_TYPED = [ "autoFill.typed", true ];
|
||||
const PREF_AUTOFILL_SEARCHENGINES = [ "autoFill.searchEngines", true ];
|
||||
const PREF_RESTYLESEARCHES = [ "restyleSearches", false ];
|
||||
const PREF_DELAY = [ "delay", 50 ];
|
||||
const PREF_BEHAVIOR = [ "matchBehavior", MATCH_BOUNDARY_ANYWHERE ];
|
||||
const PREF_DEFAULT_BEHAVIOR = [ "default.behavior", DEFAULT_BEHAVIOR ];
|
||||
@ -372,7 +371,6 @@ XPCOMUtils.defineLazyGetter(this, "Prefs", () => {
|
||||
store.autofill = prefs.get(...PREF_AUTOFILL);
|
||||
store.autofillTyped = prefs.get(...PREF_AUTOFILL_TYPED);
|
||||
store.autofillSearchEngines = prefs.get(...PREF_AUTOFILL_SEARCHENGINES);
|
||||
store.restyleSearches = prefs.get(...PREF_RESTYLESEARCHES);
|
||||
store.delay = prefs.get(...PREF_DELAY);
|
||||
store.matchBehavior = prefs.get(...PREF_BEHAVIOR);
|
||||
store.filterJavaScript = prefs.get(...PREF_FILTER_JS);
|
||||
@ -1046,7 +1044,7 @@ Search.prototype = {
|
||||
}
|
||||
|
||||
// Restyle past searches, unless they are bookmarks or special results.
|
||||
if (Prefs.restyleSearches && match.style == "favicon") {
|
||||
if (match.style == "favicon") {
|
||||
this._maybeRestyleSearchMatch(match);
|
||||
}
|
||||
|
||||
|
@ -15,20 +15,11 @@ add_task(function* test_searchEngine() {
|
||||
addBookmark({ uri: uri2, title: "Terms - SearchEngine Search" });
|
||||
|
||||
do_log_info("Past search terms should be styled, unless bookmarked");
|
||||
Services.prefs.setBoolPref("browser.urlbar.restyleSearches", true);
|
||||
yield check_autocomplete({
|
||||
search: "term",
|
||||
matches: [ { uri: uri1, title: "Terms", searchEngine: "SearchEngine", style: ["favicon", "search"] },
|
||||
{ uri: uri2, title: "Terms - SearchEngine Search", style: ["bookmark"] } ]
|
||||
});
|
||||
|
||||
do_log_info("Past search terms should not be styled if restyling is disabled");
|
||||
Services.prefs.setBoolPref("browser.urlbar.restyleSearches", false);
|
||||
yield check_autocomplete({
|
||||
search: "term",
|
||||
matches: [ { uri: uri1, title: "Terms - SearchEngine Search" },
|
||||
{ uri: uri2, title: "Terms - SearchEngine Search", style: ["bookmark"] } ]
|
||||
});
|
||||
|
||||
yield cleanup();
|
||||
});
|
||||
|
Loading…
x
Reference in New Issue
Block a user