Bug 1407956 - Port
bug 1407613 to TB: Remove dropmarker from the generic autocomplete binding, remove use of enablehistory. r=jorgk
--- a/mail/base/content/extraCustomizeItems.xul
+++ b/mail/base/content/extraCustomizeItems.xul
@@ -32,17 +32,16 @@
<textbox id="searchInput"
class="searchBox"
flex="1"
type="glodacomplete"
searchbutton="true"
autocompletesearch="gloda"
autocompletepopup="PopupGlodaAutocomplete"
autocompletesearchparam="global"
- enablehistory="false"
timeout="200"
maxlength="192"
placeholder=""
emptytextbase="&search.label.base1;"
keyLabelNonMac="&search.keyLabel.nonmac;"
keyLabelMac="&search.keyLabel.mac;"
>
<!-- Mimic the search/clear buttons of the standard search textbox,
--- a/mail/base/content/specialTabs.xul
+++ b/mail/base/content/specialTabs.xul
@@ -53,17 +53,16 @@
<hbox flex="1" class="remote-gloda-search-container">
<textbox class="remote-gloda-search searchBox"
flex="1"
type="glodacomplete"
searchbutton="true"
autocompletesearch="gloda"
autocompletepopup="PopupGlodaAutocomplete"
autocompletesearchparam="global"
- enablehistory="false"
timeout="200"
maxlength="192"
placeholder=""
emptytextbase="&search.label.base1;"
keyLabelNonMac="&search.keyLabel.nonmac;"
keyLabelMac="&search.keyLabel.mac;">
<hbox>
<image class="gloda-search-icon" />
--- a/mail/components/im/content/chat-messenger-overlay.xul
+++ b/mail/components/im/content/chat-messenger-overlay.xul
@@ -155,17 +155,16 @@
<textbox id="IMSearchInput"
class="searchBox"
flex="1"
type="glodacomplete"
searchbutton="true"
autocompletesearch="gloda"
autocompletepopup="PopupGlodaAutocomplete"
autocompletesearchparam="global"
- enablehistory="false"
timeout="200"
maxlength="192"
placeholder=""
emptytextbase="&search.label.base1;"
keyLabelNonMac="&search.keyLabel.nonmac;"
keyLabelMac="&search.keyLabel.mac;"
>
<!-- Mimic the search/clear buttons of the standard search textbox,
--- a/mail/themes/linux/mail/searchBox.css
+++ b/mail/themes/linux/mail/searchBox.css
@@ -29,29 +29,16 @@ textbox:not([searchbutton]) > .textbox-i
opacity: 1;
}
.textbox-search-clear:not([disabled]):hover:active {
-moz-image-region: auto;
transform: scale(0.8);
}
-/* things from xul.css that only exist if Thunderbird did not define
- * AUTOCOMPLETE_OLD_STYLE
- */
-
-.autocomplete-history-dropmarker {
- display: none;
-}
-
-.autocomplete-history-dropmarker[enablehistory="true"] {
- display: -moz-box;
- -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#history-dropmarker");
-}
-
.remote-gloda-search-container {
padding-top: 3px;
padding-bottom: 2px;
}
.searchBox,
#view-task-edit-field,
#unifinder-task-edit-field {
--- a/mail/themes/osx/mail/searchBox.css
+++ b/mail/themes/osx/mail/searchBox.css
@@ -91,30 +91,16 @@
transform: scaleX(-1);
}
.remote-gloda-search-container {
padding-top: 1px;
padding-bottom: 1px;
}
-
-/* things from xul.css that only exist if Thunderbird did not define
- * AUTOCOMPLETE_OLD_STYLE
- */
-
-.autocomplete-history-dropmarker {
- display: none;
-}
-
-.autocomplete-history-dropmarker[enablehistory="true"] {
- display: -moz-box;
- -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#history-dropmarker");
-}
-
#PopupGlodaAutocomplete {
margin-top: -1px;
color: -moz-FieldText;
background-color: -moz-Field;
-moz-appearance: none;
}
#PopupGlodaAutocomplete > .autocomplete-richlistbox {
--- a/mail/themes/windows/mail/searchBox.css
+++ b/mail/themes/windows/mail/searchBox.css
@@ -47,29 +47,16 @@ textbox:not([searchbutton]) > .textbox-i
opacity: 1;
}
.textbox-search-clear:not([disabled]):hover:active {
-moz-image-region: auto;
transform: scale(0.8);
}
-/* things from xul.css that only exist if Thunderbird did not define
- * AUTOCOMPLETE_OLD_STYLE
- */
-
-.autocomplete-history-dropmarker {
- display: none;
-}
-
-.autocomplete-history-dropmarker[enablehistory="true"] {
- display: -moz-box;
- -moz-binding: url("chrome://global/content/bindings/autocomplete.xml#history-dropmarker");
-}
-
.remote-gloda-search-container {
padding-top: 1px;
padding-bottom: 1px;
}
.searchBox,
#view-task-edit-field,
#unifinder-task-edit-field {
--- a/mailnews/db/gloda/content/glodacomplete.css
+++ b/mailnews/db/gloda/content/glodacomplete.css
@@ -85,10 +85,8 @@ richlistitem[type="gloda-contact-chunk"]
overflow: -moz-hidden-unscrollable;
}
.autocomplete-richlistitem[type="gloda-multi"] {
-moz-binding: url("chrome://gloda/content/glodacomplete.xml#gloda-multi-item");
-moz-box-orient: vertical;
overflow: -moz-hidden-unscrollable;
}
-
-/* .autocomplete-history-dropmarker wants to be optional, but we don't care */
\ No newline at end of file