Backed out changeset e3c1fffb0145 (bug 978861) due to m-o test failures. CLOSED TREE
authorMike de Boer <mdeboer@mozilla.com>
Fri, 02 May 2014 18:00:16 +0200
changeset 181785 f4782d7db879522c36eb6062b4237becc03de530
parent 181784 34516556f823394bb0822fa093c1bf3d62c85b63
child 181786 5e1f22e16fa42c2976815e2ed0d06420f1423f04
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
bugs978861
milestone32.0a1
backs oute3c1fffb0145233bde8fad42deef96dc13db632b
Backed out changeset e3c1fffb0145 (bug 978861) due to m-o test failures. CLOSED TREE
modules/libpref/src/init/all.js
toolkit/content/widgets/findbar.xml
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -518,21 +518,17 @@ pref("accessibility.typeaheadfind.autost
 // other - "auto"   (case-sensitive for mixed-case input, insensitive otherwise)
 pref("accessibility.typeaheadfind.casesensitive", 0);
 pref("accessibility.typeaheadfind.linksonly", true);
 pref("accessibility.typeaheadfind.startlinksonly", false);
 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);
 
 // use Mac OS X Appearance panel text smoothing setting when rendering text, disabled by default
 pref("gfx.use_text_smoothing_setting", false);
 
 // loading and rendering of framesets and iframes
 pref("browser.frames.enabled", true);
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -1193,23 +1193,16 @@
           let searchString = this.browser.finder.setSearchStringToSelection();
           if (searchString)
             this._findField.value = searchString;
         ]]></body>
       </method>
 
       <method name="_onFindFieldFocus">
         <body><![CDATA[
-          let prefsvc =
-            Components.classes["@mozilla.org/preferences-service;1"]
-                      .getService(Components.interfaces.nsIPrefBranch);
-          const kPref = "accessibility.typeaheadfind.prefillwithselection";
-          if (this.prefillWithSelection && prefsvc.getBoolPref(kPref))
-            return;
-
           let clipboardSearchString = this._browser.finder.clipboardSearchString;
           if (clipboardSearchString && this._findField.value != clipboardSearchString) {
             this._findField.value = clipboardSearchString;
             // Changing the search string makes the previous status invalid, so
             // we better clear it here.
             this._updateStatusUI();
           }
         ]]></body>