Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merging backout

Browse Source
This commit is contained in:
Dave Townsend 2010-06-08 11:20:45 -07:00
commit 00204343fd
5 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/test/Makefile.in
View File

@ -123,7 +123,6 @@ _BROWSER_FILES = \
browser_bug555224.js \
browser_bug556061.js \
browser_bug563588.js \
browser_bug569342.js \
browser_contextSearchTabPosition.js \
browser_ctrlTab.js \
browser_discovery.js \

48
browser/base/content/test/browser_bug569342.js
View File

@ -1,48 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/
*/
var gTab = null;
function cleanUp() {
gBrowser.removeTab(gTab);
finish();
}
// function borrowed from browser_bug386835.js
function load(tab, url, cb) {
tab.linkedBrowser.addEventListener("load", function (event) {
event.currentTarget.removeEventListener("load", arguments.callee, true);
cb();
}, true);
tab.linkedBrowser.loadURI(url);
}
function test() {
waitForExplicitFinish();
gTab = gBrowser.selectedTab = gBrowser.addTab();
ok(gFindBar.hidden, "Find bar should not be visible");
run_test_1();
}
function run_test_1() {
load(gTab, "about:config", function() {
ok(gFindBar.hidden, "Find bar should not be visible");
EventUtils.synthesizeKey("/", {}, gTab.linkedBrowser.contentWindow);
ok(gFindBar.hidden, "Find bar should not be visible");
run_test_2();
});
}
function run_test_2() {
load(gTab, "about:addons", function() {
ok(gFindBar.hidden, "Find bar should not be visible");
EventUtils.synthesizeKey("/", {}, gTab.linkedBrowser.contentWindow);
ok(gFindBar.hidden, "Find bar should not be visible");
cleanUp();
});
}

1
toolkit/components/viewconfig/content/config.xul
View File

@ -48,7 +48,6 @@
windowtype="Preferences:ConfigManager"
width="750"
height="500"
disablefastfind="true"
onunload="onConfigUnload();"
onload="onConfigLoad();">

13
toolkit/content/widgets/findbar.xml
View File

@ -1368,15 +1368,10 @@
return false;
}
// disable FAYT in about:blank to prevent FAYT opening unexpectedly.
var url = this.browser.currentURI;
if (url.spec == "about:blank")
return false;
// disable FAYT in documents that ask for it to be disabled.
if ((url.schemeIs("about") || url.schemeIs("chrome")) &&
(win.document.documentElement &&
win.document.documentElement.getAttribute("disablefastfind") == "true"))
// disable FAYT in about:config and about:blank to prevent FAYT
// opening unexpectedly - to fix bugs 264562, 267150, 269712
var url = this.browser.currentURI.spec;
if (url == "about:blank" || url == "about:config")
return false;
if (win) {

1
toolkit/mozapps/extensions/content/extensions.xul
View File

@ -46,7 +46,6 @@
]>
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
disablefastfind="true"
id="addons-page" title="&addons.windowTitle;">
<script type="application/javascript"