From f6137449b6d6cb31273e6c456fe1c64bf06ab0fe Mon Sep 17 00:00:00 2001 From: JustOff Date: Wed, 28 Nov 2018 17:45:20 +0200 Subject: Revert "[PALEMOON] Sanitize - "Form and search history" sanitize also the Findbar text and history (Ctrl-Z)" This reverts commit a97887a67742aa3f95c47ad79b3c4c3827565944. --- application/palemoon/base/content/sanitize.js | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/application/palemoon/base/content/sanitize.js b/application/palemoon/base/content/sanitize.js index 0c85fa215..b4d13d895 100644 --- a/application/palemoon/base/content/sanitize.js +++ b/application/palemoon/base/content/sanitize.js @@ -257,18 +257,13 @@ Sanitizer.prototype = { .getService(Components.interfaces.nsIWindowMediator); var windows = windowManager.getEnumerator("navigator:browser"); while (windows.hasMoreElements()) { - let currentWindow = windows.getNext(); - let currentDocument = currentWindow.document; + let currentDocument = windows.getNext().document; let searchBar = currentDocument.getElementById("searchbar"); if (searchBar) searchBar.textbox.reset(); - 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 findBar = currentDocument.getElementById("FindToolbar"); + if (findBar) + findBar.clear(); } let change = { op: "remove" }; @@ -284,8 +279,7 @@ Sanitizer.prototype = { .getService(Components.interfaces.nsIWindowMediator); var windows = windowManager.getEnumerator("navigator:browser"); while (windows.hasMoreElements()) { - let currentWindow = windows.getNext(); - let currentDocument = currentWindow.document; + let currentDocument = windows.getNext().document; let searchBar = currentDocument.getElementById("searchbar"); if (searchBar) { let transactionMgr = searchBar.textbox.editor.transactionManager; @@ -296,12 +290,8 @@ Sanitizer.prototype = { return false; } } - let tabBrowser = currentWindow.gBrowser; - let findBarCanClear = Array.some(tabBrowser.tabs, function (aTab) { - return tabBrowser.isFindBarInitialized(aTab) && - tabBrowser.getFindBar(aTab).canClear; - }); - if (findBarCanClear) { + let findBar = currentDocument.getElementById("FindToolbar"); + if (findBar && findBar.canClear) { aCallback("formdata", true, aArg); return false; } -- cgit v1.2.3