diff options
| -rw-r--r-- | application/palemoon/base/content/sanitize.js | 24 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/scratchpad.properties | 8 | ||||
| -rw-r--r-- | modules/libpref/init/all.js | 2 |
3 files changed, 22 insertions, 12 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; } diff --git a/devtools/client/locales/en-US/scratchpad.properties b/devtools/client/locales/en-US/scratchpad.properties index 250b0cb2f..ae8d08891 100644 --- a/devtools/client/locales/en-US/scratchpad.properties +++ b/devtools/client/locales/en-US/scratchpad.properties @@ -64,12 +64,12 @@ confirmRevert=Do you want to revert the changes you made to this scratchpad? # you try to revert unsaved content of scratchpad. confirmRevert.title=Revert Changes -# LOCALIZATION NOTE (scratchpadIntro): This is a multi-line comment explaining +# LOCALIZATION NOTE (scratchpadIntro1): This is a multi-line comment explaining # how to use the Scratchpad. Note that this should be a valid JavaScript # comment inside /* and */. scratchpadIntro1=/*\n * This is a JavaScript Scratchpad.\n *\n * Enter some JavaScript, then Right Click or choose from the Execute Menu:\n * 1. Run to evaluate the selected text (%1$S),\n * 2. Inspect to bring up an Object Inspector on the result (%2$S), or,\n * 3. Display to insert the result in a comment after the selection. (%3$S)\n */\n\n -# LOCALIZATION NOTE (notification.browserContext): This is the message displayed +# LOCALIZATION NOTE (browserContext.notification): This is the message displayed # over the top of the editor when the user has switched to browser context. browserContext.notification=This scratchpad executes in the Browser context. @@ -82,7 +82,7 @@ help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad # Scratchpad. scratchpad.statusBarLineCol = Line %1$S, Col %2$S -# LOCALIZATION NOTE (fileExists.notification): This is the message displayed +# LOCALIZATION NOTE (fileNoLongerExists.notification): This is the message displayed # over the top of the the editor when a file does not exist. fileNoLongerExists.notification=This file no longer exists. @@ -99,7 +99,7 @@ connectionTimeout=Connection timeout. Check the Error Console on both ends for p # %1 is the text of selfxss.okstring selfxss.msg=Scam Warning: Take care when pasting things you don’t understand. This could allow attackers to steal your identity or take control of your computer. Please type ‘%S’ in the scratchpad below to allow pasting. -# LOCALIZATION NOTE (selfxss.msg): the string to be typed +# LOCALIZATION NOTE (selfxss.okstring): the string to be typed # in by a new user of the developer tools when they receive the sefxss.msg prompt. # Please avoid using non-keyboard characters here selfxss.okstring=allow pasting diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index b128c0b49..8ef75e360 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -3389,7 +3389,7 @@ pref("gfx.font_rendering.cleartype_params.force_gdi_classic_for_families", "Arial,Consolas,Courier New,Microsoft Sans Serif,Segoe UI,Tahoma,Trebuchet MS,Verdana"); // The maximum size at which we will force GDI classic mode using // force_gdi_classic_for_families. -pref("gfx.font_rendering.cleartype_params.force_gdi_classic_max_size", 15); +pref("gfx.font_rendering.cleartype_params.force_gdi_classic_max_size", 17); pref("ui.key.menuAccessKeyFocuses", true); |