Backout Bug 952735 - Autocomplete does not work in address book for lists CLOSED TREE

This commit is contained in:
Philipp Kewisch 2014-02-16 18:16:53 +01:00
Родитель a3cee8c158
Коммит 822b208e08
6 изменённых файлов: 6 добавлений и 10 удалений

Просмотреть файл

@ -38,7 +38,6 @@
type="autocomplete"
flex="1"
autocompletesearch="addrbook ldap"
autocompletesearchparam="{}"
timeout="300"
maxrows="4"
completedefaultindex="true"

Просмотреть файл

@ -57,8 +57,7 @@
<listcell class="addressingWidgetCell">
<textbox id="addressCol1#1" class="plain textbox-addressingWidget uri-element"
type="autocomplete" flex="1"
autocompletesearch="addrbook ldap"
autocompletesearchparam="{}" timeout="300" maxrows="4"
autocompletesearch="addrbook ldap" timeout="300" maxrows="4"
completedefaultindex="true" forcecomplete="true"
minresultsforpopup="3"
ontextentered="awRecipientTextCommand(eventParam, this)"

Просмотреть файл

@ -67,8 +67,7 @@
<listcell class="addressingWidgetCell">
<textbox id="addressCol1#1" class="plain textbox-addressingWidget uri-element"
type="autocomplete" flex="1"
autocompletesearch="addrbook ldap"
autocompletesearchparam="{}" timeout="300" maxrows="4"
autocompletesearch="addrbook ldap" timeout="300" maxrows="4"
completedefaultindex="true" forcecomplete="true"
minresultsforpopup="3"
ontextentered="awRecipientTextCommand(eventParam, this)"

Просмотреть файл

@ -342,7 +342,7 @@ nsAbAutoCompleteSearch.prototype = {
aPreviousResult, aListener) {
let params = JSON.parse(aSearchParam);
var result = new nsAbAutoCompleteResult(aSearchString);
if (params.type && !this.applicableHeaders.has(params.type)) {
if (!this.applicableHeaders.has(params.type)) {
result.searchResult = ACR.RESULT_IGNORED;
aListener.onSearchResult(this, result);
return;
@ -430,7 +430,7 @@ nsAbAutoCompleteSearch.prototype = {
var dir = allABs.getNext();
if (dir instanceof Components.interfaces.nsIAbDirectory &&
(!params.idKey || dir.useForAutocomplete(params.idKey))) {
dir.useForAutocomplete(params.idKey)) {
this._searchCards(searchQuery, dir, result);
this._searchWithinEmails(emailSearchQuery, fullString, dir, result);
}

Просмотреть файл

@ -158,7 +158,7 @@ nsAbLDAPAutoCompleteSearch.prototype = {
startSearch: function startSearch(aSearchString, aParam,
aPreviousResult, aListener) {
let params = JSON.parse(aParam);
let applicable = !params.type || this.applicableHeaders.has(params.type);
let applicable = this.applicableHeaders.has(params.type);
let idKey = params.idKey;
this._result = new nsAbLDAPAutoCompleteResult(aSearchString);

Просмотреть файл

@ -65,8 +65,7 @@
class="plain textbox-addressingWidget uri-element"
type="autocomplete"
flex="1"
autocompletesearch="addrbook ldap"
autocompletesearchparam="{}" timeout="300" maxrows="4"
autocompletesearch="addrbook ldap" timeout="300" maxrows="4"
completedefaultindex="true" forcecomplete="true"
minresultsforpopup="3"
ontextentered="awRecipientTextCommand(eventParam, this)"