fix for #129961. Enter in ab quick search textbox should search immediately.

also, remove duplicate code.
r=shliang, sr=bienvenu, a=asa

mailnews/addrbook/resources/content/abCommon.js

@@ -873,3 +873,45 @@ function DirPaneHasFocus()
   return (top.document.commandDispatcher.focusedElement == dirTree)
 }
 
+function onAbSearchKeyPress(event)
+{
+  // 13 == return
+  if (event && event.keyCode == 13) 
+    onAbSearchInput(true);
+}
+    
+function onAbSearchInput(returnKeyHit)
+{
+  SearchInputChanged();
+
+  if (gSearchTimer) {
+    clearTimeout(gSearchTimer);
+    gSearchTimer = null;
+  }
+
+  if (returnKeyHit) {
+    onEnterInSearchBar();
+  }
+  else {
+    gSearchTimer = setTimeout("onEnterInSearchBar();", 800);
+  }
+}
+
+function SearchInputChanged() 
+{
+  var clearButton = document.getElementById("clear");
+  if (clearButton) {
+    if (gSearchInput.value && (gSearchInput.value != ""))
+      clearButton.removeAttribute("disabled");
+    else
+      clearButton.setAttribute("disabled", "true");
+  }
+}
+
+function onAbClearSearch() 
+{
+  if (gSearchInput) 
+    gSearchInput.value ="";  //on input does not get fired for some reason
+  onAbSearchInput(true);
+}
+

mailnews/addrbook/resources/content/abSelectAddressesDialog.js

@@ -404,43 +404,6 @@ function onEnterInSearchBar()
   SelectFirstCard();
 }
 
-function onAbSearchInputMenulist(event)
-{
-  SearchInputChanged();
-
-  if (gSearchTimer) {
-    clearTimeout(gSearchTimer);
-    gSearchTimer = null;
-  }
-
-  if (event && event.keyCode == 13) {
-    onEnterInSearchBar();
-  }
-  else {
-    gSearchTimer = setTimeout("onEnterInSearchBar();", 800);
-  }
-}
-
-function onAbSearchReset(event) 
-{
-  gSearchInput.value = "";
-  ChangeDirectoryByDOMNode(abList.selectedItem);
-  
-  SearchInputChanged();
-
-  onReset(event);
-}
-
-function SearchInputChanged() {
-  var clearButton = document.getElementById("clear");
-  if (clearButton) {
-    if (gSearchInput.value && (gSearchInput.value != ""))
-      clearButton.removeAttribute("disabled");
-    else
-      clearButton.setAttribute("disabled", "true");
-  }
-}
-
 function SelectFirstAddressBookMenulist()
 {
   ChangeDirectoryByDOMNode(abList.selectedItem);

mailnews/addrbook/resources/content/abSelectAddressesDialog.xul

@@ -77,8 +77,10 @@ Contributor(s):
         </template>
       </menulist>  
 	  <label value="&for.label;"/> 
-	  <textbox id="searchInput" flex="1" oninput="onAbSearchInputMenulist(event);"/>    
-	  <button id="clear" label="&clearButton.label;" oncommand="onAbSearchReset(event);"/>
+	  <textbox id="searchInput" flex="1"
+      oninput="onAbSearchInput(false);"
+      onkeypress="onAbSearchKeyPress(event);"/>  
+	  <button id="clear" label="&clearButton.label;" disabled="true" oncommand="onAbClearSearch();"/>
     </hbox>
     
     <hbox flex="1">    

mailnews/addrbook/resources/content/addressbook-panel.xul

@@ -78,7 +78,9 @@
     </hbox>
 	<hbox align="center">
 	  <label value="&for.label;"/> 
-	  <textbox id="searchInput" flex="1" oninput="onAbSearchInputMenulist(event);"/> 
+	  <textbox id="searchInput" flex="1"
+      oninput="onAbSearchInput(false);"
+      onkeypress="onAbSearchKeyPress(event);"/>
 	</hbox>
 
 <outliner id="abResultsOutliner" flex="1" context="composeMail" onclick="AbResultsPaneOnClick(event);" class="plain">

mailnews/addrbook/resources/content/addressbook.js

@@ -533,19 +533,3 @@ function onEnterInSearchBar()
   // but not for LDAP searches
   SelectFirstCard();
 }
-
-function onAbSearchInput(event)
-{
-  if (gSearchTimer) {
-    clearTimeout(gSearchTimer);
-    gSearchTimer = null;
-  }
-
-  if (event && event.keyCode == 13) {
-    onEnterInSearchBar();
-  }
-  else {
-    gSearchTimer = setTimeout("onEnterInSearchBar();", 800);
-  }
-}
-

mailnews/addrbook/resources/content/addressbook.xul

@@ -315,7 +315,10 @@ Contributor(s):
 
       <hbox id="searchBox" persist="collapsed" align="center">
         <label id="searchCriteria" value="&SearchNameOrEmail.label;"/>
-        <textbox id="searchInput" flex="1" oninput="onAbSearchInput(event);"/>
+        <textbox id="searchInput" flex="1" 
+                oninput="onAbSearchInput(false);"
+                onkeypress="onAbSearchKeyPress(event);"/>
+        <button id="clear" label="&clearButton.label;" disabled="true" oncommand="onAbClearSearch();"/>
         <button id="advancedButton" label="&advancedButton.label;" 
                 tooltiptext="&advancedButton.tooltip;" 
                 oncommand="onAdvancedAbSearch();"/>

mailnews/base/resources/content/searchBar.js

@@ -236,8 +236,8 @@ function onClearSearch()
 {
   if (gSearchInput) 
     gSearchInput.value ="";  //on input does not get fired for some reason
-  onSearchInput(null);
-}  
+  onSearchInput(true);
+}
 
 function disableQuickSearchClearButton()
 {