summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/palemoon/base/content/sanitize.js24
1 files changed, 17 insertions, 7 deletions
diff --git a/application/palemoon/base/content/sanitize.js b/application/palemoon/base/content/sanitize.js
index f2eb24a55..74372a4af 100644
--- a/application/palemoon/base/content/sanitize.js
+++ b/application/palemoon/base/content/sanitize.js
@@ -257,13 +257,18 @@ Sanitizer.prototype = {
.getService(Components.interfaces.nsIWindowMediator);
var windows = windowManager.getEnumerator("navigator:browser");
while (windows.hasMoreElements()) {
- let currentDocument = windows.getNext().document;
+ let currentWindow = windows.getNext();
+ let currentDocument = currentWindow.document;
let searchBar = currentDocument.getElementById("searchbar");
if (searchBar)
searchBar.textbox.reset();
- let findBar = currentDocument.getElementById("FindToolbar");
- if (findBar)
- findBar.clear();
+ let tabBrowser = currentWindow.gBrowser;
+ for (let tab of tabBrowser.tabs) {
+ if (tabBrowser.isFindBarInitialized(tab))
+ tabBrowser.getFindBar(tab).clear();
+ }
+ // Clear any saved find value
+ tabBrowser._lastFindValue = "";
}
let change = { op: "remove" };
@@ -279,7 +284,8 @@ Sanitizer.prototype = {
.getService(Components.interfaces.nsIWindowMediator);
var windows = windowManager.getEnumerator("navigator:browser");
while (windows.hasMoreElements()) {
- let currentDocument = windows.getNext().document;
+ let currentWindow = windows.getNext();
+ let currentDocument = currentWindow.document;
let searchBar = currentDocument.getElementById("searchbar");
if (searchBar) {
let transactionMgr = searchBar.textbox.editor.transactionManager;
@@ -290,8 +296,12 @@ Sanitizer.prototype = {
return false;
}
}
- let findBar = currentDocument.getElementById("FindToolbar");
- if (findBar && findBar.canClear) {
+ let tabBrowser = currentWindow.gBrowser;
+ let findBarCanClear = Array.some(tabBrowser.tabs, function (aTab) {
+ return tabBrowser.isFindBarInitialized(aTab) &&
+ tabBrowser.getFindBar(aTab).canClear;
+ });
+ if (findBarCanClear) {
aCallback("formdata", true, aArg);
return false;
}