зеркало из https://github.com/mozilla/gecko-dev.git
Bug 604419 - Selecting "Don't show this message..." should prevent pop-up blocked info bar from being displayed. r=gavin ui-r=faaborg a=blockingfinal
This commit is contained in:
Frank Yan
Родитель
3fb20d9aee
Коммит
ec535afdff
|
|
@ -437,7 +437,6 @@ pref("dom.disable_window_flip", true);
|
|||
// popups.policy 1=allow,2=reject
|
||||
pref("privacy.popups.policy", 1);
|
||||
pref("privacy.popups.usecustom", true);
|
||||
pref("privacy.popups.firstTime", true);
|
||||
pref("privacy.popups.showBrowserMessage", true);
|
||||
|
||||
pref("privacy.item.cookies", false);
|
||||
|
|
|
|||
|
|
@ -585,27 +585,9 @@ const gPopupBlockerObserver = {
|
|||
|
||||
dontShowMessage: function ()
|
||||
{
|
||||
#if 0
|
||||
// Disabled until bug 594294 is fixed.
|
||||
var showMessage = gPrefService.getBoolPref("privacy.popups.showBrowserMessage");
|
||||
var firstTime = gPrefService.getBoolPref("privacy.popups.firstTime");
|
||||
|
||||
// If the info message is showing at the top of the window, and the user has never
|
||||
// hidden the message before, show an info box telling the user where the info
|
||||
// will be displayed.
|
||||
if (showMessage && firstTime)
|
||||
this._displayPageReportFirstTime();
|
||||
|
||||
gPrefService.setBoolPref("privacy.popups.showBrowserMessage", !showMessage);
|
||||
#endif
|
||||
|
||||
gBrowser.getNotificationBox().removeCurrentNotification();
|
||||
},
|
||||
|
||||
_displayPageReportFirstTime: function ()
|
||||
{
|
||||
window.openDialog("chrome://browser/content/pageReportFirstTime.xul", "_blank",
|
||||
"dependent");
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code, released
|
||||
# March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998-1999
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# David Hyatt (hyatt@apple.com)
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
|
||||
|
||||
<!DOCTYPE dialog [
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
|
||||
%brandDTD;
|
||||
<!ENTITY % pageReportFirstTimeDTD SYSTEM "chrome://browser/locale/pageReportFirstTime.dtd" >
|
||||
%pageReportFirstTimeDTD;
|
||||
]>
|
||||
|
||||
<dialog id="pageReportFirstTime"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&caption.label;"
|
||||
onload="setTimeout(function() { window.sizeToContent(); }, 100);"
|
||||
style="width: 40em;"
|
||||
buttons="accept"
|
||||
persist="screenX screenY"
|
||||
screenX="24" screenY="24">
|
||||
|
||||
<description>
|
||||
&startDescriptionText.label;
|
||||
</description>
|
||||
|
||||
<separator class="thin"/>
|
||||
|
||||
<hbox pack="center">
|
||||
<!-- insert example here! (bug 594294) -->
|
||||
</hbox>
|
||||
|
||||
<separator class="thin"/>
|
||||
|
||||
<description>
|
||||
&endDescription.label;
|
||||
</description>
|
||||
|
||||
</dialog>
|
||||
|
|
@ -38,7 +38,6 @@ browser.jar:
|
|||
* content/browser/pageinfo/security.js (content/pageinfo/security.js)
|
||||
* content/browser/openLocation.js (content/openLocation.js)
|
||||
* content/browser/openLocation.xul (content/openLocation.xul)
|
||||
* content/browser/pageReportFirstTime.xul (content/pageReportFirstTime.xul)
|
||||
* content/browser/safeMode.js (content/safeMode.js)
|
||||
* content/browser/safeMode.xul (content/safeMode.xul)
|
||||
* content/browser/sanitize.js (content/sanitize.js)
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
<!ENTITY startDescriptionText.label "A web site has attempted to open a pop-up window without your permission. &brandShortName; has automatically closed the pop-up window.">
|
||||
|
||||
<!ENTITY endDescription.label "You can click on this icon to see which sites &brandShortName; blocked and to allow those sites to open pop-ups if they are required for the site to function correctly.">
|
||||
|
||||
<!ENTITY caption.label "About Pop-up Blocking">
|
||||
|
||||
<!ENTITY done.label "Done">
|
||||
|
|
@ -19,7 +19,6 @@
|
|||
locale/browser/openLocation.properties (%chrome/browser/openLocation.properties)
|
||||
* locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd)
|
||||
locale/browser/pageInfo.properties (%chrome/browser/pageInfo.properties)
|
||||
locale/browser/pageReportFirstTime.dtd (%chrome/browser/pageReportFirstTime.dtd)
|
||||
locale/browser/quitDialog.properties (%chrome/browser/quitDialog.properties)
|
||||
* locale/browser/safeMode.dtd (%chrome/browser/safeMode.dtd)
|
||||
locale/browser/sanitize.dtd (%chrome/browser/sanitize.dtd)
|
||||
|
|
|
|||
|
|
@ -281,7 +281,6 @@ var xml = <prefs>
|
|||
<pref><name>intl.charsetmenu.browser.more4</name></pref>
|
||||
<pref><name>network.http.keep-alive</name></pref>
|
||||
<pref><name>ui.key.accelKey</name></pref>
|
||||
<pref><name>privacy.popups.firstTime</name></pref>
|
||||
<pref><name>browser.fixup.alternate.enabled</name></pref>
|
||||
<pref><name>font.name-list.serif.x-cans</name></pref>
|
||||
<pref><name>security.enable_ssl3</name></pref>
|
||||
|
|
|
|||
|
|
@ -196,7 +196,6 @@ class Firefox_runner:
|
|||
userprefs = open(os.path.join(this.profile_dir, "user.js"), "w")
|
||||
userprefs.write("user_pref(\"network.proxy.autoconfig_url\", \"file://%s\");\n" % this.proxypac)
|
||||
userprefs.write("user_pref(\"network.proxy.type\", 2);\n")
|
||||
userprefs.write("user_pref(\"privacy.popups.firstTime\", false);\n")
|
||||
userprefs.write("user_pref(\"dom.max_script_run_time\", 0);\n")
|
||||
userprefs.write("user_pref(\"dom.max_script_run_time\", 0);\n")
|
||||
userprefs.write("user_pref(\"dom.allow_scripts_to_close_windows\", true);\n")
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ sub global_prefs {
|
|||
|
||||
# Suppress firefox's popup blocking
|
||||
if ($Settings::BinaryName =~ /^firefox/) {
|
||||
Prefs::set_pref($pref_file, 'privacy.popups.firstTime', 'false');
|
||||
Prefs::set_pref($pref_file, 'dom.disable_open_during_load', 'false');
|
||||
|
||||
# Suppress default browser dialog
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ userPrefs = {
|
|||
'dom.disable_window_move_resize': 'false',
|
||||
'layout.fire_onload_after_image_background_loads': 'true',
|
||||
'javascript.options.showInConsole': 'true',
|
||||
'privacy.popups.firstTime': 'false',
|
||||
'layout.debug.enable_data_xbl': 'true',
|
||||
'shell.checkDefaultClient': 'false',
|
||||
'browser.EULA.override': 'true'
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче