Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 917422 - Update Do Not Track strings for Metro and add a Learn More link [r=rsilveira]

Browse Source
This commit is contained in:
Matt Brubeck 2013-10-01 17:23:48 -07:00
parent c6d3da3393
commit 0b6c80bbe8
6 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/metro/base/content/browser-ui.js
View File

@ -85,6 +85,8 @@ var BrowserUI = {
Services.prefs.addObserver(debugServerStateChanged, this, false);
Services.prefs.addObserver(debugServerPortChanged, this, false);
Services.obs.addObserver(this, "handle-xul-text-link", false);
// listen content messages
messageManager.addMessageListener("DOMTitleChanged", this);
messageManager.addMessageListener("DOMWillOpenModalDialog", this);
@ -172,6 +174,7 @@ var BrowserUI = {
uninit: function() {
messageManager.removeMessageListener("Browser:MozApplicationManifest", OfflineApps);
Services.obs.removeObserver(this, "handle-xul-text-link");
PanelUI.uninit();
FlyoutPanelsUI.uninit();
@ -573,6 +576,13 @@ var BrowserUI = {
observe: function BrowserUI_observe(aSubject, aTopic, aData) {
switch (aTopic) {
case "handle-xul-text-link":
let handled = aSubject.QueryInterface(Ci.nsISupportsPRBool);
if (!handled.data) {
this.addAndShowTab(aData, Browser.selectedTab);
handled.data = true;
}
break;
case "nsPref:changed":
switch (aData) {
case "browser.cache.disk_cache_ssl":

10
browser/metro/base/content/browser.xul
View File

@ -680,17 +680,17 @@
<setting pref="toolkit.telemetry.enabled" type="bool" title="&optionsHeader.telemetry.label;"/>
</settings>
<settings id="prefs-dnt" label="&doNotTrack.title;">
<description>&doNotTrack.desc;</description>
<setting id="prefs-dnt-value" pref="privacy.donottrackheader.value" type="radio" >
<radiogroup id="prefs-dnt-options">
<radio id="prefs-dnt-notrack" class="flyoutpanel-hack"
label="&doNotTrack.options.trackingNotOkay;" value="1"/>
<radio id="prefs-dnt-nopref" class="flyoutpanel-hack"
label="&doNotTrack.options.noPreference;" value="-1"/>
label="&doNotTrack.options.doNotTrack;" value="1"/>
<radio id="prefs-dnt-oktrack" class="flyoutpanel-hack"
label="&doNotTrack.options.trackingOkay;" value="0"/>
label="&doNotTrack.options.doTrack;" value="0"/>
<radio id="prefs-dnt-nopref" class="flyoutpanel-hack"
label="&doNotTrack.options.default;" value="-1"/>
</radiogroup>
</setting>
<label class="text-link" href="https://www.mozilla.org/dnt">&doNotTrack.learnMoreLink;</label>
</settings>
</flyoutpanel>

1
browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
View File

@ -51,7 +51,6 @@ let AboutFlyoutPanel = {
if (aEvent.button != 0) {
return;
}
FlyoutPanelsUI.hide();
let url = Services.urlFormatter.formatURLPref("app.privacyURL");
BrowserUI.addAndShowTab(url, Browser.selectedTab);
},

10
browser/metro/base/content/flyoutpanels/FlyoutPanelsUI.js
View File

@ -38,10 +38,12 @@ let FlyoutPanelsUI = {
});
Services.obs.addObserver(this, "metro_viewstate_changed", false);
window.addEventListener("TabOpen", this, false);
},
uninit: function () {
Services.obs.removeObserver(this, "metro_viewstate_changed");
window.removeEventListener("TabOpen", this, false);
},
show: function(aToShow) {
@ -79,6 +81,14 @@ let FlyoutPanelsUI = {
return this._currentFlyout ? true : false;
},
handleEvent: function (aEvent) {
switch (aEvent.type) {
case "TabOpen":
this.hide()
break;
}
},
observe: function (aSubject, aTopic, aData) {
switch (aTopic) {
case "metro_viewstate_changed":

9
browser/metro/locales/en-US/chrome/preferences.dtd
View File

@ -32,10 +32,11 @@
<!ENTITY optionsHeader.privacy.passwords.label "Remember Passwords">
<!ENTITY doNotTrack.title "Do Not Track">
<!ENTITY doNotTrack.desc "Tell sites:">
<!ENTITY doNotTrack.options.trackingNotOkay "I do not want to be tracked">
<!ENTITY doNotTrack.options.noPreference "Nothing about my tracking preferences">
<!ENTITY doNotTrack.options.trackingOkay "I want to be tracked">
<!ENTITY doNotTrack.options.doNotTrack "Tell websites that I do not want to be tracked">
<!ENTITY doNotTrack.options.doTrack "Tell websites that I want to be tracked">
<!ENTITY doNotTrack.options.default "Do not tell websites anything about my tracking preferences">
<!ENTITY doNotTrack.learnMoreLink "Learn more&#x2026;">
<!ENTITY optionsHeader.reporting.title "Crash Reporter">
<!ENTITY optionsHeader.reporting.crashes.label "&brandShortName; submits crash reports to help Mozilla make your browser more stable and secure">
<!ENTITY optionsHeader.telemetry.title "Telemetry">

3
browser/metro/profile/metro.js
View File

@ -215,6 +215,9 @@ pref("extensions.blocklist.detailsURL", "https://www.mozilla.org/%LOCALE%/blockl
pref("dom.disable_open_during_load", true);
pref("privacy.popups.showBrowserMessage", true);
// Metro Firefox keeps this set to -1 when donottrackheader.enabled is false.
pref("privacy.donottrackheader.value", -1);
/* disable opening windows with the dialog feature */
pref("dom.disable_window_open_dialog_feature", true);