Merge pull request #1653 from janekptacijarabaci/urlbar_placeholder_2

"Enter address" if the feature "autocomplete" and "keyword.enabled" are disabled

1 files changed, 7 insertions, 3 deletions

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2e1e94e03..5a832c077 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -347,8 +347,9 @@ var gURLBarSettings = {
   prefSuggests: [
     "bookmark",
     "history",
-    "openpage",
+    "openpage"
   ],
+  prefKeyword: "keyword.enabled",
 
   observe: function(aSubject, aTopic, aData) {
     if (aTopic != "nsPref:changed")
@@ -359,10 +360,11 @@ var gURLBarSettings = {
 
   writePlaceholder: function() {
     let attribute = "placeholder";
-    let suggests = this.prefSuggests.map(pref => {
+    let prefs = this.prefSuggests.map(pref => {
       return this.prefSuggest + pref;
     });
-    let placeholderDefault = suggests.some(pref => {
+    prefs.push(this.prefKeyword);
+    let placeholderDefault = prefs.some(pref => {
       return gPrefService.getBoolPref(pref);
     });
 
@@ -1009,6 +1011,7 @@ var gBrowserInit = {
     Services.obs.addObserver(gXSSObserver, "xss-on-violate-policy", false);
 
     gPrefService.addObserver(gURLBarSettings.prefSuggest, gURLBarSettings, false);
+    gPrefService.addObserver(gURLBarSettings.prefKeyword, gURLBarSettings, false);
 
     gURLBarSettings.writePlaceholder();
 
@@ -1359,6 +1362,7 @@ var gBrowserInit = {
 
       try {
         gPrefService.removeObserver(gURLBarSettings.prefSuggest, gURLBarSettings);
+        gPrefService.removeObserver(gURLBarSettings.prefKeyword, gURLBarSettings);
       } catch (ex) {
         Cu.reportError(ex);
       }