1) get rid of old quicksearch widget, which was scaring andrew; 2) should fix the display of the 'clear' button on linux/windows gloda-facet
authorDavid Ascher <david@mozillamessaging.com>
Tue, 01 Sep 2009 11:55:03 -0700
branchgloda-facet
changeset 3628 7d4f855c51663e33a57242a7d86d405df73d1530
parent 3627 ed8521134a42d09cbe7ee24ddb561477ac30ca80
child 3629 3f46a7a6ae24273c0cc6e525433d67f7d4cfd89e
push id2927
push userbugmail@asutherland.org
push dateThu, 10 Sep 2009 01:15:56 +0000
treeherdercomm-central@0b161ed73eb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1
1) get rid of old quicksearch widget, which was scaring andrew; 2) should fix the display of the 'clear' button on linux/windows
mail/base/content/extraCustomizeItems.xul
mail/base/content/messenger.css
mail/base/content/search.xml
mail/themes/gnomestripe/mail/searchBox.css
mail/themes/qute/mail/searchBox.css
--- a/mail/base/content/extraCustomizeItems.xul
+++ b/mail/base/content/extraCustomizeItems.xul
@@ -69,87 +69,16 @@
                  type="glodacomplete"
                  searchbutton="true"
                  autocompletesearch="gloda"
                  autocompletepopup="PopupGlodaAutocomplete"
                  >
         </textbox>
     </toolbaritem>
 
-    <toolbaritem id="search-container" insertafter="button-stop"
-                 title="&searchItem.title;"
-                 align="center"
-                 class="chromeclass-toolbar-additional">
-      <textbox id="old_searchInput" timeout="800" flex="1"
-               onfocus="onSearchInputFocus(event);"
-               onclick="onSearchInputClick(event);"
-               onmousedown="onSearchInputMousedown(event);"
-               onblur="onSearchInputBlur(event);"
-               oncommand="onEnterInSearchBar();"
-               onkeypress="onSearchKeyPress();"
-               chromedir="&locale.dir;">
-        <button id="quick-search-button" type="menu" chromedir="&locale.dir;">
-          <menupopup id="quick-search-menupopup"
-                     value="2"
-                     persist="value"
-                     onpopupshowing="InitQuickSearchPopup();"
-                     popupalign="topleft"
-                     popupanchor="bottomleft">
-            <!-- The sequence of menu items must have a contiguous strictly
-                 increasing sequence of ordinals starting at 0 (see the
-                 VK_UP/VK_DOWN key handlers in search.xml) -->
-            <menuitem id="searchSubjectMenu"
-                      value="0"
-                      ordinal="0"
-                      label="&searchSubjectMenu.label;"
-                      type="radio"
-                      oncommand="changeQuickSearchMode(this)"/>
-            <menuitem id="searchFromMenu"
-                      value="1"
-                      ordinal="1"
-                      label="&searchFromMenu.label;"
-                      type="radio"
-                      oncommand="changeQuickSearchMode(this)" />
-            <menuitem id="searchSubjectOrFromMenu"
-                      value="2"
-                      ordinal="2"
-                      label="&searchSubjectOrFromMenu.label;"
-                      type="radio"
-                      oncommand="changeQuickSearchMode(this)"/>
-            <menuitem id="searchRecipient"
-                      value="5"
-                      ordinal="3"
-                      label="&searchRecipient.label;"
-                      type="radio"
-                      oncommand="changeQuickSearchMode(this)"/>
-            <menuitem id="searchSubjectOrRecipient"
-                      value="6"
-                      ordinal="4"
-                      label="&searchSubjectOrRecipientMenu.label;"
-                      type="radio"
-                      oncommand="changeQuickSearchMode(this)"/>
-            <menuitem id="searchMessageBody"
-                      value="3"
-                      ordinal="5"
-                      label="&searchMessageBody.label;"
-                      type="radio"
-                      oncommand="changeQuickSearchMode(this)"/>
-            <!-- The ordinal of that separator must be the biggest ordinal of a
-                 valid quicksearch option, plus one (see the VK_UP / VK_DOWN key
-                 handlers in search.xml). -->
-            <menuseparator id="quickSearchAfterLastOptionSeparator"
-                           ordinal="6"/>
-            <menuitem id="quickSearchSaveAsVirtualFolder"
-                      ordinal="99"
-                      label="&saveAsVirtualFolderMenu.label;"
-                      oncommand="saveViewAsVirtualFolder()"/>
-          </menupopup>
-        </button>
-      </textbox>
-    </toolbaritem>
     <toolbarbutton id="button-compact" class="toolbarbutton-1"
                    insertafter="button-mark"
                    label="&compactButton.label;"
                    tooltiptext="&compactButton.tooltip;"
                    oncommand="goDoCommand('button_compact');"
                    observes="button_compact"/>
     <toolbaritem id="folder-location-container" insert-after="button-stop"
                  title="&folderLocationToolbarItem.title;"
--- a/mail/base/content/messenger.css
+++ b/mail/base/content/messenger.css
@@ -163,20 +163,16 @@ searchterm {
 dummy.usesMailWidgets {
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#dummy");
 }
 
 #searchInput {
   -moz-binding: url("chrome://messenger/content/search.xml#glodaSearch");
 }
 
-#oldsearchInput {
-  -moz-binding: url("chrome://messenger/content/search.xml#searchbar");
-}
-
 .quick-search-button {
   -moz-binding: url("chrome://messenger/content/search.xml#searchBarDropMarker");
   cursor: default;
   -moz-user-focus: none;
 }
 
 .quick-search-clearbutton{
   cursor: default;
--- a/mail/base/content/search.xml
+++ b/mail/base/content/search.xml
@@ -200,16 +200,17 @@
           saveAsVF.setAttribute("anonid", "quick-search-save-as-virtual-folder");
           saveAsVF.setAttribute("label", this.quickSearchStrings.get("saveAsVirtualFolder.label"));
           saveAsVF.setAttribute("oncommand",
                                 "gFolderTreeController.newVirtualFolder(this.parentNode.parentNode.parentNode.value,\
                                 gFolderDisplay.view.search.session.searchTerms);");
 
           this.menupopup.appendChild(saveAsVF);
           this.updateSaveItem();
+          this.input = "";
         } catch (e) {
           logException(e);
         }
         ]]></body>
       </method>
 
       <method name="observe">
       <parameter name="aSubject"/>
--- a/mail/themes/gnomestripe/mail/searchBox.css
+++ b/mail/themes/gnomestripe/mail/searchBox.css
@@ -34,31 +34,25 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 */
 
 /* ..... tree adjustments ..... */
 
-.quick-search-textbox
-{
+.quick-search-textbox {
   padding-top: 1px;
 }
 
-#searchInput[searchCriteria="true"]  {
-  color: grey;
-}
-
 #quick-search-button  {
   margin-top: 0px;
   margin-bottom: 0px;
   -moz-margin-start: 0px;
   -moz-margin-end: 2px;
-
 }
 
 .quick-search-button-image {
   margin: 0px;
   list-style-image: url("chrome://global/skin/icons/Search-glass.png");
 }
 
 .quick-search-button-image[chromedir="rtl"] {
--- a/mail/themes/qute/mail/searchBox.css
+++ b/mail/themes/qute/mail/searchBox.css
@@ -34,25 +34,20 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 */
 
 /* ..... tree adjustments ..... */
 
-.quick-search-textbox
-{
+.quick-search-textbox {
   padding-top: 1px;
 }
 
-#searchInput[searchCriteria="true"]  {
-  color: grey;
-}
-
 #quick-search-button  {
   margin-top: 0px;
   margin-bottom: 0px;
   -moz-margin-start: 0px;
   -moz-margin-end: 2px;
 }
 
 .quick-search-button-image {