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

Backed out changeset 4ac25e196c7a (bug 738797)

Browse Source
This commit is contained in:
Jared Wein 2014-05-11 17:37:40 -04:00
parent f538071e39
commit 50e546f84d
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/app/profile/firefox.js
View File

@ -811,7 +811,11 @@ pref("plugin.state.f5 sam inspection host plugin", 2);
// display door hanger if flash not installed // display door hanger if flash not installed
pref("plugins.notifyMissingFlash", true); pref("plugins.notifyMissingFlash", true);
#ifdef XP_WIN
pref("browser.preferences.instantApply", false);
#else
pref("browser.preferences.instantApply", true); pref("browser.preferences.instantApply", true);
#endif
#ifdef XP_MACOSX #ifdef XP_MACOSX
pref("browser.preferences.animateFadeIn", true); pref("browser.preferences.animateFadeIn", true);
#else #else
@ -819,7 +823,7 @@ pref("browser.preferences.animateFadeIn", false);
#endif #endif
// Toggles between the two Preferences implementations, pop-up window and in-content // Toggles between the two Preferences implementations, pop-up window and in-content
pref("browser.preferences.inContent", true); pref("browser.preferences.inContent", false);
pref("browser.download.show_plugins_in_list", true); pref("browser.download.show_plugins_in_list", true);
pref("browser.download.hide_plugins_without_extensions", true); pref("browser.download.hide_plugins_without_extensions", true);

24
browser/base/content/test/general/browser_offlineQuotaNotification.js
View File

@ -38,11 +38,6 @@ function checkPreferences(prefsWin) {
} }
function test() { function test() {
if (Services.prefs.getBoolPref("browser.preferences.inContent")) {
// Bug 881576 - ensure this works with inContent prefs.
todo(false, "Bug 881576 - this test needs to be updated for inContent prefs");
return;
}
waitForExplicitFinish(); waitForExplicitFinish();
gBrowser.selectedBrowser.addEventListener("load", function onload() { gBrowser.selectedBrowser.addEventListener("load", function onload() {
gBrowser.selectedBrowser.removeEventListener("load", onload, true); gBrowser.selectedBrowser.removeEventListener("load", onload, true);
@ -55,13 +50,18 @@ function test() {
// window to open - which we track either via a window watcher (for // window to open - which we track either via a window watcher (for
// the window-based prefs) or via an "Initialized" event (for // the window-based prefs) or via an "Initialized" event (for
// in-content prefs.) // in-content prefs.)
Services.ww.registerNotification(function wwobserver(aSubject, aTopic, aData) { if (Services.prefs.getBoolPref("browser.preferences.inContent")) {
if (aTopic != "domwindowopened") // Bug 881576 - ensure this works with inContent prefs.
return; todo(false, "Bug 881576 - this test needs to be updated for inContent prefs");
Services.ww.unregisterNotification(wwobserver); } else {
checkPreferences(aSubject); Services.ww.registerNotification(function wwobserver(aSubject, aTopic, aData) {
}); if (aTopic != "domwindowopened")
PopupNotifications.panel.firstElementChild.button.click(); return;
Services.ww.unregisterNotification(wwobserver);
checkPreferences(aSubject);
});
PopupNotifications.panel.firstElementChild.button.click();
}
}); });
}; };
Services.prefs.setIntPref("offline-apps.quota.warn", 1); Services.prefs.setIntPref("offline-apps.quota.warn", 1);