diff options
author | Moonchild <mcwerewolf@gmail.com> | 2018-03-21 10:06:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-21 10:06:59 +0100 |
commit | 66f2e55e3ca2446aa9f8480d6a48c1bc89af52b4 (patch) | |
tree | 7b291a5ae5da715d2b3d9d5af10ff0e7c7fd7930 | |
parent | d427760ad7554e20d07ae6646885ff9c9876f7a0 (diff) | |
parent | f99436a7ebf95d789a996713720c1820401b97d8 (diff) | |
download | palemoon-gre-66f2e55e3ca2446aa9f8480d6a48c1bc89af52b4.tar.gz |
Merge pull request #1652 from janekptacijarabaci/urlbar_placeholder_1
[suggestion] "Enter address" if the feature "autocomplete" is disabled
-rw-r--r-- | browser/base/content/browser.js | 50 | ||||
-rw-r--r-- | browser/base/content/browser.xul | 2 | ||||
-rw-r--r-- | browser/locales/en-US/chrome/browser/browser.dtd | 1 | ||||
-rw-r--r-- | browser/locales/en-US/chrome/browser/browser.properties | 2 |
4 files changed, 53 insertions, 2 deletions
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 34b91b6cb..2e1e94e03 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -336,6 +336,46 @@ const gSessionHistoryObserver = { } }; +var gURLBarSettings = { + prefSuggest: "browser.urlbar.suggest.", + /* + For searching in the source code: + browser.urlbar.suggest.bookmark + browser.urlbar.suggest.history + browser.urlbar.suggest.openpage + */ + prefSuggests: [ + "bookmark", + "history", + "openpage", + ], + + observe: function(aSubject, aTopic, aData) { + if (aTopic != "nsPref:changed") + return; + + this.writePlaceholder(); + }, + + writePlaceholder: function() { + let attribute = "placeholder"; + let suggests = this.prefSuggests.map(pref => { + return this.prefSuggest + pref; + }); + let placeholderDefault = suggests.some(pref => { + return gPrefService.getBoolPref(pref); + }); + + if (placeholderDefault) { + gURLBar.setAttribute( + attribute, gNavigatorBundle.getString("urlbar.placeholder")); + } else { + gURLBar.setAttribute( + attribute, gNavigatorBundle.getString("urlbar.placeholderURLOnly")); + } + } +}; + /** * Given a starting docshell and a URI to look up, find the docshell the URI * is loaded in. @@ -968,6 +1008,10 @@ var gBrowserInit = { Services.obs.addObserver(gXPInstallObserver, "addon-install-complete", false); Services.obs.addObserver(gXSSObserver, "xss-on-violate-policy", false); + gPrefService.addObserver(gURLBarSettings.prefSuggest, gURLBarSettings, false); + + gURLBarSettings.writePlaceholder(); + BrowserOffline.init(); OfflineApps.init(); IndexedDBPromptHelper.init(); @@ -1314,6 +1358,12 @@ var gBrowserInit = { Services.obs.removeObserver(gXSSObserver, "xss-on-violate-policy"); try { + gPrefService.removeObserver(gURLBarSettings.prefSuggest, gURLBarSettings); + } catch (ex) { + Cu.reportError(ex); + } + + try { gPrefService.removeObserver(gHomeButton.prefDomain, gHomeButton); } catch (ex) { Cu.reportError(ex); diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index f83010023..3044ce675 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -410,7 +410,7 @@ <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" title="&locationItem.title;" class="chromeclass-location" removable="true"> <textbox id="urlbar" flex="1" - placeholder="&urlbar.placeholder2;" + placeholder="" type="autocomplete" autocompletesearch="urlinline history" autocompletesearchparam="enable-actions" diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd index fe5f64854..0225f422b 100644 --- a/browser/locales/en-US/chrome/browser/browser.dtd +++ b/browser/locales/en-US/chrome/browser/browser.dtd @@ -337,7 +337,6 @@ These should match what Safari and other Apple applications use on OS X Lion. -- <!ENTITY appMenuSafeMode.label "Restart in Safe Modeā¦"> <!ENTITY openCmd.commandkey "l"> -<!ENTITY urlbar.placeholder2 "Search or enter address"> <!ENTITY urlbar.accesskey "d"> <!ENTITY urlbar.switchToTab.label "Switch to tab:"> diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties index 5f75502ed..8b3fea4d5 100644 --- a/browser/locales/en-US/chrome/browser/browser.properties +++ b/browser/locales/en-US/chrome/browser/browser.properties @@ -220,6 +220,8 @@ tabHistory.goBack=Go back to this page tabHistory.goForward=Go forward to this page # URL Bar +urlbar.placeholder=Search or enter address +urlbar.placeholderURLOnly=Enter address pasteAndGo.label=Paste & Go # Block autorefresh |