From 15e4265ceb4a920157faf5c29da91564370a54a0 Mon Sep 17 00:00:00 2001 From: Mike de Boer Date: Tue, 6 May 2014 12:01:48 +0200 Subject: [PATCH] Bug 978861: disable prefillWithSelection on OSX by default, fix its semantics when enabled. r=ehsan --- modules/libpref/src/init/all.js | 4 ++++ .../content/tests/chrome/findbar_window.xul | 19 ++++++++++--------- toolkit/content/widgets/findbar.xml | 7 +++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index ddd42dfc655..f32dc479d8b 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -523,7 +523,11 @@ pref("accessibility.typeaheadfind.timeout", 4000); pref("accessibility.typeaheadfind.enabletimeout", true); pref("accessibility.typeaheadfind.soundURL", "beep"); pref("accessibility.typeaheadfind.enablesound", true); +#ifdef XP_MACOSX +pref("accessibility.typeaheadfind.prefillwithselection", false); +#else pref("accessibility.typeaheadfind.prefillwithselection", true); +#endif pref("accessibility.typeaheadfind.matchesCountTimeout", 250); pref("accessibility.typeaheadfind.matchesCountLimit", 100); diff --git a/toolkit/content/tests/chrome/findbar_window.xul b/toolkit/content/tests/chrome/findbar_window.xul index d338c235717..9fb618f5b52 100644 --- a/toolkit/content/tests/chrome/findbar_window.xul +++ b/toolkit/content/tests/chrome/findbar_window.xul @@ -33,6 +33,12 @@ var gClipboard = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard); var gHasFindClipboard = gClipboard.supportsFindClipboard(); + // Since bug 978861, this pref is set to `false` on OSX. For this test, we'll + // set it `true` to disable the find clipboard on OSX, which interferes with + // our tests. + let prefsvc = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); + prefsvc.setBoolPref("accessibility.typeaheadfind.prefillwithselection", true); + var gStatusText; var gXULBrowserWindow = { QueryInterface: function(aIID) { @@ -359,12 +365,10 @@ highlightButton.click(); ok(highlightButton.checked, "testFindWithHighlight 3: Highlight All should be checked."); - if (!gHasFindClipboard) { - a = gFindBar._findField.value; - b = gFindBar._browser.finder._fastFind.searchString; - c = gFindBar._browser.finder.searchString; - ok(a == searchStr && b == c, "testFindWithHighlight 4: " + a + ", " + b + ", " + c + "."); - } + a = gFindBar._findField.value; + b = gFindBar._browser.finder._fastFind.searchString; + c = gFindBar._browser.finder.searchString; + ok(a == searchStr && b == c, "testFindWithHighlight 4: " + a + ", " + b + ", " + c + "."); gFindBar.onFindAgainCommand(); a = gFindBar._findField.value; @@ -489,9 +493,6 @@ } function testClipboardSearchString(aExpected) { - if (!gHasFindClipboard) - return; - if (!aExpected) aExpected = ""; var searchStr = gFindBar.browser.finder.clipboardSearchString; diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml index 4b548765f41..64b4b86dfed 100644 --- a/toolkit/content/widgets/findbar.xml +++ b/toolkit/content/widgets/findbar.xml @@ -1198,6 +1198,13 @@