wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 851606 - automatically disable bug 818340 in beta/release, but leave it enabled in nightly/aurora. r=gavin

Browse Source
This commit is contained in:
Sid Stamm 2013-05-14 12:11:56 -04:00
parent 357a5710a9
commit 657cbf39b4
9 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/preferences/in-content/jar.mn
View File

@ -11,7 +11,7 @@ browser.jar:
* content/browser/preferences/in-content/tabs.xul
* content/browser/preferences/in-content/tabs.js
content/browser/preferences/in-content/privacy.xul
content/browser/preferences/in-content/privacy.js
* content/browser/preferences/in-content/privacy.js
* content/browser/preferences/in-content/advanced.xul
* content/browser/preferences/in-content/advanced.js
content/browser/preferences/in-content/applications.xul

13
browser/components/preferences/in-content/privacy.js
View File

@ -178,8 +178,13 @@ var gPrivacyPane = {
// select the remember forms history option
document.getElementById("browser.formfill.enable").value = true;
#ifdef RELEASE_BUILD
// select the allow cookies option
document.getElementById("network.cookie.cookieBehavior").value = 0;
#else
// select the limit cookies option
document.getElementById("network.cookie.cookieBehavior").value = 3;
#endif
// select the cookie lifetime policy option
document.getElementById("network.cookie.lifetimePolicy").value = 0;
@ -399,11 +404,19 @@ var gPrivacyPane = {
var accept = document.getElementById("acceptCookies");
var acceptThirdPartyMenu = document.getElementById("acceptThirdPartyMenu");
#ifdef RELEASE_BUILD
// if we're enabling cookies, automatically select 'accept third party always'
if (accept.checked)
acceptThirdPartyMenu.selectedIndex = 0;
return accept.checked ? 0 : 2;
#else
// if we're enabling cookies, automatically select 'accept third party from visited'
if (accept.checked)
acceptThirdPartyMenu.selectedIndex = 1;
return accept.checked ? 3 : 2;
#endif
},
/**

9
browser/components/preferences/in-content/tests/Makefile.in
View File

@ -18,12 +18,19 @@ MOCHITEST_BROWSER_FILES := \
browser_connection.js \
browser_privacypane_1.js \
browser_privacypane_3.js \
browser_privacypane_4.js \
browser_privacypane_5.js \
browser_privacypane_8.js \
privacypane_tests_perwindow.js \
$(NULL)
ifdef ENABLE_TESTS
pp_mochitest_browser_files := \
browser_privacypane_4.js \
$(NULL)
pp_mochitest_browser_files_PATH := $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
PP_TARGETS += pp_mochitest_browser_files
endif # ENABLE_TESTS
ifdef MOZ_SERVICES_HEALTHREPORT
MOCHITEST_BROWSER_FILES += \
browser_healthreport.js \

5
browser/components/preferences/in-content/tests/browser_privacypane_4.js
View File

@ -15,8 +15,13 @@ function test() {
run_test_subset([
test_custom_retention("acceptCookies", "remember"),
test_custom_retention("acceptCookies", "custom"),
#ifdef RELEASE_BUILD
test_custom_retention("acceptThirdPartyMenu", "remember", "visited"),
test_custom_retention("acceptThirdPartyMenu", "custom", "always"),
#else
test_custom_retention("acceptThirdPartyMenu", "remember", "always"),
test_custom_retention("acceptThirdPartyMenu", "custom", "visited"),
#endif
test_custom_retention("keepCookiesUntil", "remember", 1),
test_custom_retention("keepCookiesUntil", "custom", 2),
test_custom_retention("keepCookiesUntil", "custom", 0),

2
browser/components/preferences/jar.mn
View File

@ -32,7 +32,7 @@ browser.jar:
content/browser/preferences/permissions.js
* content/browser/preferences/preferences.xul
content/browser/preferences/privacy.xul
content/browser/preferences/privacy.js
* content/browser/preferences/privacy.js
content/browser/preferences/sanitize.xul
content/browser/preferences/sanitize.js
content/browser/preferences/security.xul

15
browser/components/preferences/privacy.js
View File

@ -180,8 +180,13 @@ var gPrivacyPane = {
// select the remember forms history option
document.getElementById("browser.formfill.enable").value = true;
#ifdef RELEASE_BUILD
// select the accept cookies option
document.getElementById("network.cookie.cookieBehavior").value = 0;
#else
// select the limit cookies option
document.getElementById("network.cookie.cookieBehavior").value = 3;
#endif
// select the cookie lifetime policy option
document.getElementById("network.cookie.lifetimePolicy").value = 0;
@ -401,13 +406,21 @@ var gPrivacyPane = {
var accept = document.getElementById("acceptCookies");
var acceptThirdPartyMenu = document.getElementById("acceptThirdPartyMenu");
#ifdef RELEASE_BUILD
// if we're enabling cookies, automatically select 'accept third party always'
if (accept.checked)
acceptThirdPartyMenu.selectedIndex = 0;
return accept.checked ? 0 : 2;
#else
// if we're enabling cookies, automatically select 'accept third party from visited'
if (accept.checked)
acceptThirdPartyMenu.selectedIndex = 1;
return accept.checked ? 3 : 2;
#endif
},
/**
* Converts between network.cookie.cookieBehavior and the third-party cookie UI
*/

9
browser/components/preferences/tests/Makefile.in
View File

@ -19,12 +19,19 @@ MOCHITEST_BROWSER_FILES := \
browser_chunk_permissions.js \
browser_privacypane_1.js \
browser_privacypane_3.js \
browser_privacypane_4.js \
browser_privacypane_5.js \
browser_privacypane_8.js \
privacypane_tests_perwindow.js \
$(NULL)
ifdef ENABLE_TESTS
pp_mochitest_browser_files := \
browser_privacypane_4.js \
$(NULL)
pp_mochitest_browser_files_PATH := $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
PP_TARGETS += pp_mochitest_browser_files
endif # ENABLE_TESTS
ifdef MOZ_SERVICES_HEALTHREPORT
MOCHITEST_BROWSER_FILES += browser_healthreport.js
endif

5
browser/components/preferences/tests/browser_privacypane_4.js
View File

@ -16,8 +16,13 @@ function test() {
run_test_subset([
test_custom_retention("acceptCookies", "remember"),
test_custom_retention("acceptCookies", "custom"),
#ifdef RELEASE_BUILD
test_custom_retention("acceptThirdPartyMenu", "remember", "visited"),
test_custom_retention("acceptThirdPartyMenu", "custom", "always"),
#else
test_custom_retention("acceptThirdPartyMenu", "remember", "always"),
test_custom_retention("acceptThirdPartyMenu", "custom", "visited"),
#endif
test_custom_retention("keepCookiesUntil", "remember", 1),
test_custom_retention("keepCookiesUntil", "custom", 2),
test_custom_retention("keepCookiesUntil", "custom", 0),

4
modules/libpref/src/init/all.js
View File

@ -1381,7 +1381,11 @@ pref("network.proxy.socks_remote_dns", false);
pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1");
pref("network.proxy.failover_timeout", 1800); // 30 minutes
pref("network.online", true); //online/offline
#ifdef RELEASE_BUILD
pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-limitForeign
#else
pref("network.cookie.cookieBehavior", 3); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-limitForeign
#endif
#ifdef ANDROID
pref("network.cookie.cookieBehavior", 0); // Keep the old default of accepting all cookies
#endif