Bug 449664 - use the new search textbox binding in the cookie viewer. r=mano

browser/components/preferences/cookies.js

@@ -67,8 +67,11 @@ var gCookiesWindow = {
 
     if ("arguments" in window && window.arguments[0] &&
         window.arguments[0].filterString)
-      this.setFilter(window.arguments[0].filterString);
-    
+    {
+      document.getElementById("filter").value = window.arguments[0].filterString;
+      this.filter();
+    }
+
     this._saveState();
       
     document.getElementById("filter").focus();
@@ -790,8 +793,7 @@ var gCookiesWindow = {
     // Revert to single-select in the tree
     this._tree.setAttribute("seltype", "single");
     
-    // Clear the Filter and the Tree Display
-    document.getElementById("filter").value = "";
+    // Clear the Tree Display
     this._view._filtered = false;
     this._view._rowCount = 0;
     this._tree.treeBoxObject.rowCountChanged(0, -this._view._filterSet.length);
@@ -826,8 +828,6 @@ var gCookiesWindow = {
     this._lastSelectedRanges = [];
 
     document.getElementById("cookiesIntro").value = this._bundle.getString("cookiesAll");
-    document.getElementById("clearFilter").disabled = true;
-    document.getElementById("filter").focus();
   },
   
   _cookieMatchesFilter: function (aCookie)
@@ -876,19 +876,13 @@ var gCookiesWindow = {
     }
   },
   
-  _filterTimeout: -1,
-  onFilterInput: function ()
+  filter: function ()
   {
-    if (this._filterTimeout != -1)
-      clearTimeout(this._filterTimeout);
-   
-    function filterCookies()
-    {
       var filter = document.getElementById("filter").value;
       if (filter == "") {
         gCookiesWindow.clearFilter();
         return;
-      }        
+      }
       var view = gCookiesWindow._view;
       view._filterSet = gCookiesWindow._filterCookies(filter);
       if (!view._filtered) {
@@ -913,17 +907,6 @@ var gCookiesWindow = {
         view.selection.select(0);
 
       document.getElementById("cookiesIntro").value = gCookiesWindow._bundle.getString("cookiesFiltered");
-      document.getElementById("clearFilter").disabled = false;
-    }
-    window.filterCookies = filterCookies;
-    this._filterTimeout = setTimeout("filterCookies();", 500);
-  },
-  
-  onFilterKeyPress: function (aEvent)
-  {
-    var filter = document.getElementById("filter").value;
-    if (aEvent.keyCode == 27 && filter != "") // ESC key
-      this.clearFilter();
   },
   
   focusFilterBox: function ()
@@ -932,11 +915,4 @@ var gCookiesWindow = {
     filter.focus();
     filter.select();
   },
-
-  setFilter: function (aFilterString)
-  {
-    document.getElementById("filter").value = aFilterString;
-    this.onFilterInput();
-  }
 };
-

browser/components/preferences/cookies.xul

@@ -62,15 +62,11 @@
     <key key="&focusSearch1.key;" modifiers="accel" oncommand="gCookiesWindow.focusFilterBox();"/>
     <key key="&focusSearch2.key;" modifiers="accel" oncommand="gCookiesWindow.focusFilterBox();"/>
   </keyset>
-           
+
   <vbox flex="1" class="contentPane">
     <hbox align="center">
       <label accesskey="&filter.accesskey;" control="filter">&filter.label;</label>
-      <textbox id="filter" flex="1" oninput="gCookiesWindow.onFilterInput();" 
-               onkeypress="gCookiesWindow.onFilterKeyPress(event);"/>
-      <button id="clearFilter" icon="clear" label="&clear.label;"
-              accesskey="&clear.accesskey;" 
-              oncommand="gCookiesWindow.clearFilter();" disabled="true"/>
+      <textbox type="search" id="filter" flex="1" oncommand="gCookiesWindow.filter();"/>
     </hbox>
     <separator class="thin"/>
     <label control="cookiesList" id="cookiesIntro" value="&cookiesonsystem.label;"/>

browser/locales/en-US/chrome/browser/preferences/cookies.dtd

@@ -22,9 +22,6 @@
 
 <!ENTITY     filter.label                   "Search:">
 <!ENTITY     filter.accesskey               "S">
-<!ENTITY     clear.label                    "Clear">
-<!ENTITY     clear.accesskey                "l">
 
 <!ENTITY     button.close.label             "Close">
 <!ENTITY     button.close.accesskey         "C">
-