diff options
Diffstat (limited to 'application')
10 files changed, 45 insertions, 68 deletions
diff --git a/application/basilisk/components/preferences/in-content/privacy.js b/application/basilisk/components/preferences/in-content/privacy.js index fced02fe6..eab606e36 100644 --- a/application/basilisk/components/preferences/in-content/privacy.js +++ b/application/basilisk/components/preferences/in-content/privacy.js @@ -22,7 +22,7 @@ var gPrivacyPane = { */ _shouldPromptForRestart: true, -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING /** * Show the Tracking Protection UI depending on the * privacy.trackingprotection.ui.enabled pref, and linkify its Learn More link @@ -131,7 +131,7 @@ var gPrivacyPane = { this.updateHistoryModePane(); this.updatePrivacyMicroControls(); this.initAutoStartPrivateBrowsingReverter(); -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING this._initTrackingProtection(); this._initTrackingProtectionPBM(); #endif @@ -160,7 +160,7 @@ var gPrivacyPane = { gPrivacyPane.clearPrivateDataNow(true); return false; }); -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING setEventListener("doNotTrackSettings", "click", function () { gPrivacyPane.showDoNotTrackSettings(); return false; @@ -174,7 +174,7 @@ var gPrivacyPane = { gPrivacyPane.showCookies); setEventListener("clearDataSettings", "command", gPrivacyPane.showClearPrivateDataSettings); -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING setEventListener("trackingProtectionRadioGroup", "command", gPrivacyPane.trackingProtectionWritePrefs); setEventListener("trackingProtectionExceptions", "command", @@ -190,7 +190,7 @@ var gPrivacyPane = { gPrivacyPane.showContainerSettings); }, -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING // TRACKING PROTECTION MODE /** @@ -472,7 +472,7 @@ var gPrivacyPane = { this._shouldPromptForRestart = true; }, -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING /** * Displays fine-grained, per-site preferences for tracking protection. */ @@ -496,7 +496,7 @@ var gPrivacyPane = { gotoPref("containers"); }, -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING /** * Displays the available block lists for tracking protection. */ diff --git a/application/basilisk/components/preferences/in-content/privacy.xul b/application/basilisk/components/preferences/in-content/privacy.xul index 8881a84fe..e6cdc5dd2 100644 --- a/application/basilisk/components/preferences/in-content/privacy.xul +++ b/application/basilisk/components/preferences/in-content/privacy.xul @@ -10,7 +10,7 @@ <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy"> <!-- Tracking --> -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING <preference id="privacy.trackingprotection.enabled" name="privacy.trackingprotection.enabled" type="bool"/> @@ -91,7 +91,7 @@ <!-- Tracking --> <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true"> -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING <vbox id="trackingprotectionbox" hidden="true"> <hbox align="start"> <vbox> diff --git a/application/basilisk/components/preferences/jar.mn b/application/basilisk/components/preferences/jar.mn index b25fc89b8..d233c7865 100644 --- a/application/basilisk/components/preferences/jar.mn +++ b/application/basilisk/components/preferences/jar.mn @@ -5,7 +5,7 @@ browser.jar: content/browser/preferences/applicationManager.xul content/browser/preferences/applicationManager.js -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING content/browser/preferences/blocklists.xul content/browser/preferences/blocklists.js #endif @@ -14,7 +14,7 @@ browser.jar: content/browser/preferences/cookies.js * content/browser/preferences/connection.xul content/browser/preferences/connection.js -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING content/browser/preferences/donottrack.xul #endif * content/browser/preferences/fonts.xul diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js index 014550190..fdef7506a 100644 --- a/application/palemoon/app/profile/palemoon.js +++ b/application/palemoon/app/profile/palemoon.js @@ -676,6 +676,9 @@ pref("browser.backspace_action", 2); pref("browser.backspace_action", 0); #endif +// Pale Moon never eats the space with word selection, regardless of O.S. +pref("layout.word_select.eat_space_to_next_word", false); + // this will automatically enable inline spellchecking (if it is available) for // editable elements in HTML // 0 = spellcheck nothing @@ -1009,7 +1012,6 @@ pref("services.sync.prefs.sync.privacy.clearOnShutdown.sessions", true); pref("services.sync.prefs.sync.privacy.clearOnShutdown.siteSettings", true); pref("services.sync.prefs.sync.privacy.clearOnShutdown.connectivityData", true); pref("services.sync.prefs.sync.privacy.donottrackheader.enabled", true); -pref("services.sync.prefs.sync.privacy.donottrackheader.value", true); pref("services.sync.prefs.sync.privacy.sanitize.sanitizeOnShutdown", true); pref("services.sync.prefs.sync.security.OCSP.enabled", true); pref("services.sync.prefs.sync.security.OCSP.require", true); diff --git a/application/palemoon/branding/unstable/pref/palemoon-branding.js b/application/palemoon/branding/unstable/pref/palemoon-branding.js index a95390cb6..2cd64fadb 100644 --- a/application/palemoon/branding/unstable/pref/palemoon-branding.js +++ b/application/palemoon/branding/unstable/pref/palemoon-branding.js @@ -26,12 +26,20 @@ pref("app.update.promptWaitTime", 86400); // URL user can browse to manually if for some reason all update installation
// attempts fail.
+#ifndef XP_LINUX
pref("app.update.url.manual", "http://www.palemoon.org/unstable/");
-
+#else
+pref("app.update.url.manual", "http://linux.palemoon.org/download/unstable/");
+#endif
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
+#ifndef XP_LINUX
pref("app.update.url.details", "http://www.palemoon.org/unstable/");
#else
+pref("app.update.url.details", "http://linux.palemoon.org/download/unstable/");
+#endif
+
+#else
// Updates disabled (Mac, etc.)
pref("app.update.enabled", false);
pref("app.update.url", "");
diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js index aa24d88ef..5910ae9c0 100644 --- a/application/palemoon/components/nsBrowserGlue.js +++ b/application/palemoon/components/nsBrowserGlue.js @@ -1207,7 +1207,7 @@ BrowserGlue.prototype = { }, _migrateUI: function BG__migrateUI() { - const UI_VERSION = 17; + const UI_VERSION = 18; const BROWSER_DOCURL = "chrome://browser/content/browser.xul#"; let currentUIVersion = 0; try { @@ -1412,6 +1412,20 @@ BrowserGlue.prototype = { delete this._rdf; delete this._dataSource; + if (currentUIVersion < 18) { + // Make sure the doNotTrack value conforms to the conversion from + // three-state to two-state. (This reverts a setting of "please track me" + // to the default "don't say anything"). + try { + if (Services.prefs.getBoolPref("privacy.donottrackheader.enabled") && + Services.prefs.getIntPref("privacy.donottrackheader.value") != 1) { + Services.prefs.clearUserPref("privacy.donottrackheader.enabled"); + Services.prefs.clearUserPref("privacy.donottrackheader.value"); + } + } + catch (ex) {} + } + // Update the migration version. Services.prefs.setIntPref("browser.migration.version", UI_VERSION); }, diff --git a/application/palemoon/components/preferences/privacy.js b/application/palemoon/components/preferences/privacy.js index 18e38395d..05c2f9b8a 100644 --- a/application/palemoon/components/preferences/privacy.js +++ b/application/palemoon/components/preferences/privacy.js @@ -151,42 +151,6 @@ var gPrivacyPane = { }, /** - * Update the Tracking preferences based on controls. - */ - setTrackingPrefs: function PPP_setTrackingPrefs() - { - let dntRadioGroup = document.getElementById("doNotTrackSelection"), - dntValuePref = document.getElementById("privacy.donottrackheader.value"), - dntEnabledPref = document.getElementById("privacy.donottrackheader.enabled"); - - // if the selected radio button says "no preference", set on/off pref to - // false and don't change the value pref. - if (dntRadioGroup.selectedItem.value == -1) { - dntEnabledPref.value = false; - return dntValuePref.value; - } - - dntEnabledPref.value = true; - return dntRadioGroup.selectedItem.value; - }, - - /** - * Obtain the tracking preference value and reflect it in the UI. - */ - getTrackingPrefs: function PPP_getTrackingPrefs() - { - let dntValuePref = document.getElementById("privacy.donottrackheader.value"), - dntEnabledPref = document.getElementById("privacy.donottrackheader.enabled"); - - // if DNT is enbaled, select the value from the selected radio - // button, otherwise choose the "no preference" radio button - if (dntEnabledPref.value) - return dntValuePref.value; - - return document.getElementById("dntnopref").value; - }, - - /** * Update the private browsing auto-start pref and the history mode * micro-management prefs based on the history mode menulist */ diff --git a/application/palemoon/components/preferences/privacy.xul b/application/palemoon/components/preferences/privacy.xul index 057d549a9..bdb227c63 100644 --- a/application/palemoon/components/preferences/privacy.xul +++ b/application/palemoon/components/preferences/privacy.xul @@ -30,9 +30,6 @@ <preference id="privacy.donottrackheader.enabled" name="privacy.donottrackheader.enabled" type="bool"/> - <preference id="privacy.donottrackheader.value" - name="privacy.donottrackheader.value" - type="int"/> <!-- XXX button prefs --> <preference id="pref.privacy.disable_button.cookie_exceptions" @@ -239,17 +236,11 @@ <!-- Tracking --> <tabpanel id="trackingPanel" orient="vertical"> - <radiogroup id="doNotTrackSelection" orient="vertical" - preference="privacy.donottrackheader.value" - onsynctopreference="return gPrivacyPane.setTrackingPrefs()" - onsyncfrompreference="return gPrivacyPane.getTrackingPrefs()"> - <radio id="dntnotrack" value="1" label="&dntTrackingNotOkay.label2;" - accesskey="&dntTrackingNotOkay.accesskey;" /> - <radio id="dntdotrack" value="0" label="&dntTrackingOkay.label2;" - accesskey="&dntTrackingOkay.accesskey;" /> - <radio id="dntnopref" value="-1" label="&dntTrackingNopref.label2;" - accesskey="&dntTrackingNopref.accesskey;" /> - </radiogroup> + <checkbox id="privacyDoNotTrackCheckbox" + label="&dntTrackingNotOkay.label2;" + accesskey="&dntTrackingNotOkay.accesskey;" + preference="privacy.donottrackheader.enabled"/> + <separator class="thin"/> <label class="text-link" id="doNotTrackInfo" href="https://www.mozilla.org/dnt" value="&doNotTrackInfo.label;"/> diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index 26b4969d6..8147124e4 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/application/palemoon/installer/package-manifest.in @@ -212,6 +212,7 @@ @RESPATH@/browser/chrome/icons/default/default48.png #endif +#ifdef MOZ_DEVTOOLS ; [Webide Files] @RESPATH@/browser/chrome/webide@JAREXT@ @RESPATH@/browser/chrome/webide.manifest @@ -221,6 +222,7 @@ @RESPATH@/browser/chrome/devtools@JAREXT@ @RESPATH@/browser/chrome/devtools.manifest @RESPATH@/browser/@PREF_DIR@/devtools.js +#endif ; shell icons #ifdef XP_UNIX diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd index 92ebf93c4..ef3303b94 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -4,12 +4,8 @@ <!ENTITY tracking.label "Tracking"> -<!ENTITY dntTrackingNopref.label2 "Do not tell sites anything about my tracking preferences"> -<!ENTITY dntTrackingNopref.accesskey "o"> <!ENTITY dntTrackingNotOkay.label2 "Tell sites that I do not want to be tracked"> <!ENTITY dntTrackingNotOkay.accesskey "n"> -<!ENTITY dntTrackingOkay.label2 "Tell sites that I want to be tracked"> -<!ENTITY dntTrackingOkay.accesskey "t"> <!ENTITY doNotTrackInfo.label "Learn More"> <!ENTITY history.label "History"> |