diff options
| author | Pale Moon <git-repo@palemoon.org> | 2016-10-09 16:31:59 +0200 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2016-10-09 16:31:59 +0200 |
| commit | 2f9f8978ad2f13a3f02e068702d52e753a758237 (patch) | |
| tree | 2d3f23179238ec49cd3e94f8159bdfa595032372 | |
| parent | c8557be78b72921c8749bf6fbbc751f810b1e6db (diff) | |
| download | palemoon-gre-2f9f8978ad2f13a3f02e068702d52e753a758237.tar.gz | |
Provide a "more information" link in the geolocation doorhanger.
| -rw-r--r-- | browser/app/profile/firefox.js | 2 | ||||
| -rw-r--r-- | browser/components/nsBrowserGlue.js | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index c4d0d63dd..8406a6b8e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -734,8 +734,8 @@ pref("goanna.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-regio // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 pref("goanna.handlerService.allowRegisterFromDifferentHost", false); -pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/"); pref("browser.mixedcontent.warning.infoURL", "http://support.mozilla.org/1/%APP%/%VERSION%/%OS%/%LOCALE%/mixed-content/"); +pref("browser.geolocation.warning.infoURL", "http://www.palemoon.org/info-url/geolocation.shtml"); pref("browser.EULA.version", 3); pref("browser.rights.version", 3); diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 38a5a3921..2133eacab 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -1777,12 +1777,14 @@ ContentPermissionPrompt.prototype = { }); } - var options = { - learnMoreURL: Services.urlFormatter.formatURLPref("browser.geolocation.warning.infoURL"), - }; + var requestingWindow = aRequest.window.top; + var chromeWin = this._getChromeWindow(requestingWindow).wrappedJSObject; + var link = chromeWin.document.getElementById("geolocation-learnmore-link"); + link.value = browserBundle.GetStringFromName("geolocation.learnMore"); + link.href = Services.urlFormatter.formatURLPref("browser.geolocation.warning.infoURL"); this._showPrompt(aRequest, message, "geo", actions, "geolocation", - "geo-notification-icon", options); + "geo-notification-icon", null); }, _promptWebNotifications : function(aRequest) { |