зеркало из https://github.com/mozilla/pjs.git
bug 233339 supplmental patch for Firefox, the UI portion is temporary and will be cleaned up before 0.9, r=ben
This commit is contained in:
mconnor%myrealbox.com
Родитель
3498f1d6cd
Коммит
e9a72bc45e
|
|
@ -4166,6 +4166,26 @@ function clearObsoletePrefs()
|
|||
}
|
||||
}
|
||||
|
||||
// removed 03/09/2003
|
||||
// last of the forked cookie prefs
|
||||
try {
|
||||
PREF.clearUserPref("network.cookie.enableForCurrentSessionOnly");
|
||||
// No error, therefore we were limiting cookies to session
|
||||
PREF.setIntPref("network.cookie.lifetimePolicy", 2);
|
||||
} catch (e) {
|
||||
// nothing to do in this case
|
||||
}
|
||||
|
||||
try {
|
||||
PREF.clearUserPref("network.cookie.warnAboutCookies");
|
||||
// No error: the pref is set to ask for cookies, set the correct pref
|
||||
// This will replace the setting if enableForCurrentSessionOnly was
|
||||
// also true, because dialogs explictly allow accepting for session
|
||||
PREF.setIntPref("network.cookie.lifetimePolicy", 1);
|
||||
} catch (e) {
|
||||
// nothing to do in this case
|
||||
}
|
||||
|
||||
// removed 10/22/2003
|
||||
try {
|
||||
PREF.clearUserPref("browser.search.defaultengine");
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@
|
|||
#define DL_RETAIN_WINDOW 0
|
||||
|
||||
var _elementIDs = ["histDay", "browserCacheDiskCache", "cookieBehavior", "enableCookies",
|
||||
"enableCookiesForOriginatingSiteOnly", "enableCookiesForCurrentSessionOnly",
|
||||
"enableCookiesButAskFirst", "enableFormFill", "enablePasswords",
|
||||
"enableCookiesForOriginatingSiteOnly", "networkCookieLifetime",
|
||||
"enableFormFill", "enablePasswords",
|
||||
"downloadsRetentionPolicy"];
|
||||
|
||||
function Startup() {
|
||||
|
|
@ -324,14 +324,16 @@ function updateCookieBroadcaster()
|
|||
{
|
||||
var broadcaster = document.getElementById("cookieBroadcaster");
|
||||
var checkbox = document.getElementById("enableCookies");
|
||||
var radiogroup = document.getElementById("networkCookieLifetime");
|
||||
if (!checkbox.checked) {
|
||||
broadcaster.setAttribute("disabled", "true");
|
||||
document.getElementById("enableCookiesForOriginatingSiteOnly").checked = false;
|
||||
document.getElementById("enableCookiesForCurrentSessionOnly").checked = false;
|
||||
document.getElementById("enableCookiesButAskFirst").checked = false;
|
||||
radiogroup.setAttribute("disabled", "true");
|
||||
}
|
||||
else
|
||||
else {
|
||||
broadcaster.removeAttribute("disabled");
|
||||
radiogroup.removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
|
||||
function onPrefsOK()
|
||||
|
|
|
|||
|
|
@ -122,14 +122,13 @@
|
|||
<checkbox id="enableCookiesForOriginatingSiteOnly" observes="cookieBroadcaster"
|
||||
label="&forOriginatingSiteOnly.label;" accesskey="&forOriginatingSiteOnly.accesskey;"
|
||||
style="margin-left: 23px;" oncommand="updateCookieBehavior();"/>
|
||||
<checkbox id="enableCookiesForCurrentSessionOnly" observes="cookieBroadcaster"
|
||||
label="&forCurrentSessionOnly.label;" accesskey="&forCurrentSessionOnly.accesskey;"
|
||||
prefstring="network.cookie.enableForCurrentSessionOnly"
|
||||
style="margin-left: 23px;"/>
|
||||
<checkbox id="enableCookiesButAskFirst" observes="cookieBroadcaster"
|
||||
label="&butAskFirst.label;" accesskey="&butAskFirst.accesskey;"
|
||||
prefstring="network.cookie.warnAboutCookies"
|
||||
style="margin-left: 23px;"/>
|
||||
<!-- FIXME: Temp UI to address fallout from bug 233339 -->
|
||||
<radiogroup style="margin-left: 23px;" id="networkCookieLifetime"
|
||||
prefstring="network.cookie.lifetimePolicy">
|
||||
<radio value="0" label="&acceptNormally.label;"/>
|
||||
<radio value="2" label="&acceptForSession.label;"/>
|
||||
<radio value="1" label="&askAboutCookies.label;"/>
|
||||
</radiogroup>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</expander>
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
<!ENTITY lHeader "Privacy">
|
||||
|
||||
<!ENTITY privacyDescription.label "As you browse the web, information about where you have been, what you have done, etc is kept in the following areas.">
|
||||
|
||||
<!ENTITY history.label "History">
|
||||
<!ENTITY pageHis.label "Remember visited pages for the last">
|
||||
<!ENTITY pageHis.accesskey "r">
|
||||
<!ENTITY days.label "days">
|
||||
<!ENTITY clearHistory.label "Clear">
|
||||
|
||||
<!ENTITY cache.label "Cache">
|
||||
<!ENTITY cacheExplanation.label "Pages you view are stored in the cache for quicker viewing later on.">
|
||||
<!ENTITY diskCache.label "Use up to:">
|
||||
<!ENTITY diskCache.accesskey "U">
|
||||
<!ENTITY kbytes "KB of disk space for the cache.">
|
||||
<!ENTITY clearCache.label "Clear">
|
||||
|
||||
<!ENTITY cookies.label "Cookies">
|
||||
<!ENTITY enableCookies.label "Enable cookies">
|
||||
<!ENTITY enableCookies.accesskey "c">
|
||||
<!ENTITY forOriginatingSiteOnly.label "for the originating Web site only">
|
||||
<!ENTITY forOriginatingSiteOnly.accesskey "W">
|
||||
<!ENTITY forCurrentSessionOnly.label "for the current session only">
|
||||
<!ENTITY forCurrentSessionOnly.accesskey "s">
|
||||
<!ENTITY cookieExplanation.label "Cookies are delicious delicacies.">
|
||||
<!ENTITY butAskFirst.label "but ask before accepting">
|
||||
<!ENTITY butAskFirst.accesskey "b">
|
||||
<!ENTITY clearCookies.label "Clear">
|
||||
<!ENTITY viewCookies.label "Stored Cookies...">
|
||||
<!ENTITY exceptions.label "Exceptions...">
|
||||
|
||||
<!ENTITY formfill.label "Saved Form Information">
|
||||
<!ENTITY formfillDescription.label "Information entered in web page forms and the Search Bar is saved to make filling out forms and searching faster.">
|
||||
<!ENTITY formfillEnable.label "Save information I enter in web page forms and the Search Bar">
|
||||
<!ENTITY formfillEnable.accesskey "f">
|
||||
<!ENTITY clearFormfill.label "Clear">
|
||||
|
||||
<!ENTITY downloads.label "Download Manager History">
|
||||
<!ENTITY downloadsDescription.label "The Download Manager keeps track of recently downloaded files.">
|
||||
<!ENTITY downloadsRetentionPolicy.label "Remove files from the Download Manager:">
|
||||
<!ENTITY downloadsRemoveImmediately.label "Upon successful download">
|
||||
<!ENTITY downloadsRemoveExit.label "When &brandShortName; exits">
|
||||
<!ENTITY downloadsRemoveManually.label "Manually">
|
||||
<!ENTITY clearDownloads.label "Clear">
|
||||
|
||||
<!ENTITY passwords.label "Saved Passwords">
|
||||
<!ENTITY passwordsDescription.label "Login information for web pages can be kept in the Password Manager so that you do not need to re-enter your login details every time you visit.">
|
||||
<!ENTITY passwordsEnable.label "Remember Passwords">
|
||||
<!ENTITY passwordsEnable.accesskey "p">
|
||||
<!ENTITY clearPasswords.label "Clear">
|
||||
<!ENTITY viewPasswords.label "View Saved Passwords...">
|
||||
|
||||
<!ENTITY clearAll.label "Clear All">
|
||||
<!ENTITY clearAllDescription.label "Clear all information stored while browsing:">
|
||||
|
||||
Загрузка…
Ссылка в новой задаче