Bug 1192769 - Clicking 'Change Search Settings' should close the search panel even if the search preferences are already the selected tab, r=Gijs.

2015-09-18 10:43:01 +02:00 · 2015-09-18 10:43:01 +02:00 · aef3f93389
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@ -1046,7 +1046,7 @@
                       class="search-panel-one-offs"/>
      <xul:vbox anonid="add-engines"/>
      <xul:button anonid="search-settings"
-                  oncommand="BrowserUITelemetry.countSearchSettingsEvent('searchbar');openPreferences('paneSearch')"
+                  oncommand="showSettings();"
                  class="search-setting-button search-panel-header"
                  label="&changeSearchSettings.button;"/>
    </content>
@ -1091,6 +1091,16 @@
                  .engine = currentEngine;
        ]]></body>
      </method>
+
+      <method name="showSettings">
+        <body><![CDATA[
+          BrowserUITelemetry.countSearchSettingsEvent("searchbar");
+          openPreferences("paneSearch");
+          // If the preference tab was already selected, the panel doesn't
+          // close itself automatically.
+          BrowserSearch.searchBar._textbox.closePopup();
+        ]]></body>
+      </method>
    </implementation>
    <handlers>
      <handler event="popuphidden"><![CDATA[