Bug 1327212 - undo a line removal done in bug 935521 that causes regressions. r=Gijs
☠☠ backed out by ebc1bed3e49f ☠ ☠
authorMike de Boer <mdeboer@mozilla.com>
Tue, 03 Jan 2017 17:52:20 +0100
changeset 327871 e1ee23936aa88210336a3d9b0097f94da7d1bb4e
parent 327870 f05a9252d28487c65648e70d124f919d6d1b81df
child 327872 54f270d101480f96eb8841ffa8f91272a713e4e2
push id35605
push usermdeboer@mozilla.com
push dateWed, 04 Jan 2017 11:28:15 +0000
treeherderautoland@e1ee23936aa8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1327212, 935521
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1327212 - undo a line removal done in bug 935521 that causes regressions. r=Gijs MozReview-Commit-ID: EJyhEUviMhI
toolkit/content/widgets/findbar.xml
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -1092,17 +1092,18 @@
         ]]></body>
       </method>
 
       <method name="updateControlState">
         <parameter name="aResult"/>
         <parameter name="aFindPrevious"/>
         <body><![CDATA[
           this._updateStatusUI(aResult, aFindPrevious);
-          this._enableFindButtons(aResult !== this.nsITypeAheadFind.FIND_NOTFOUND);
+          this._enableFindButtons(aResult !== this.nsITypeAheadFind.FIND_NOTFOUND &&
+            !!this._findField.value);
         ]]></body>
       </method>
 
       <method name="_dispatchFindEvent">
         <parameter name="aType"/>
         <parameter name="aFindPrevious"/>
         <body><![CDATA[
           let event = document.createEvent("CustomEvent");
@@ -1341,16 +1342,17 @@
             if (clipboardSearchString)
               aSelectionString = clipboardSearchString;
           }
 
           if (aSelectionString)
             this._findField.value = aSelectionString;
 
           if (aIsInitialSelection) {
+            this._enableFindButtons(!!this._findField.value);
             this._findField.select();
             this._findField.focus();
 
             this._startFindDeferred.resolve();
             this._startFindDeferred = null;
           }
         ]]></body>
       </method>