Bug 952735: Autocomplete does not work in address book for lists (and in other places). r=mconley, r=neil, r=philipp
Signed-off-by: Jens Müller <ich@tessarakt.de> Landing on CLOSED TREE. --- calendar/base/content/dialogs/calendar-event-dialog-attendees.xml | 1 + mail/components/addrbook/content/abEditListDialog.xul | 3 ++- mail/components/addrbook/content/abMailListDialog.xul | 3 ++- mailnews/addrbook/src/nsAbAutoCompleteSearch.js | 4 ++-- mailnews/addrbook/src/nsAbLDAPAutoCompleteSearch.js | 2 +- suite/mailnews/addrbook/abListOverlay.xul | 3 ++- 6 files changed, 10 insertions(+), 6 deletions(-)
This commit is contained in:
Родитель
52420e73f8
Коммит
38cd21dc8c
|
@ -38,6 +38,7 @@
|
|||
type="autocomplete"
|
||||
flex="1"
|
||||
autocompletesearch="addrbook ldap"
|
||||
autocompletesearchparam="{}"
|
||||
timeout="300"
|
||||
maxrows="4"
|
||||
completedefaultindex="true"
|
||||
|
|
|
@ -57,7 +57,8 @@
|
|||
<listcell class="addressingWidgetCell">
|
||||
<textbox id="addressCol1#1" class="plain textbox-addressingWidget uri-element"
|
||||
type="autocomplete" flex="1"
|
||||
autocompletesearch="addrbook ldap" timeout="300" maxrows="4"
|
||||
autocompletesearch="addrbook ldap"
|
||||
autocompletesearchparam="{}" timeout="300" maxrows="4"
|
||||
completedefaultindex="true" forcecomplete="true"
|
||||
minresultsforpopup="3"
|
||||
ontextentered="awRecipientTextCommand(eventParam, this)"
|
||||
|
|
|
@ -67,7 +67,8 @@
|
|||
<listcell class="addressingWidgetCell">
|
||||
<textbox id="addressCol1#1" class="plain textbox-addressingWidget uri-element"
|
||||
type="autocomplete" flex="1"
|
||||
autocompletesearch="addrbook ldap" timeout="300" maxrows="4"
|
||||
autocompletesearch="addrbook ldap"
|
||||
autocompletesearchparam="{}" 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 (!this.applicableHeaders.has(params.type)) {
|
||||
if (params.type && !this.applicableHeaders.has(params.type)) {
|
||||
result.searchResult = ACR.RESULT_IGNORED;
|
||||
aListener.onSearchResult(this, result);
|
||||
return;
|
||||
|
@ -428,7 +428,6 @@ nsAbAutoCompleteSearch.prototype = {
|
|||
// just going to find duplicates.
|
||||
while (allABs.hasMoreElements()) {
|
||||
var dir = allABs.getNext();
|
||||
|
||||
if (dir instanceof Components.interfaces.nsIAbDirectory &&
|
||||
dir.useForAutocomplete(params.idKey)) {
|
||||
this._searchCards(searchQuery, dir, result);
|
||||
|
|
|
@ -162,7 +162,7 @@ nsAbLDAPAutoCompleteSearch.prototype = {
|
|||
startSearch: function startSearch(aSearchString, aParam,
|
||||
aPreviousResult, aListener) {
|
||||
let params = JSON.parse(aParam);
|
||||
let applicable = this.applicableHeaders.has(params.type);
|
||||
let applicable = !params.type || this.applicableHeaders.has(params.type);
|
||||
let idKey = params.idKey;
|
||||
|
||||
this._result = new nsAbLDAPAutoCompleteResult(aSearchString);
|
||||
|
|
|
@ -65,7 +65,8 @@
|
|||
class="plain textbox-addressingWidget uri-element"
|
||||
type="autocomplete"
|
||||
flex="1"
|
||||
autocompletesearch="addrbook ldap" timeout="300" maxrows="4"
|
||||
autocompletesearch="addrbook ldap"
|
||||
autocompletesearchparam="{}" timeout="300" maxrows="4"
|
||||
completedefaultindex="true" forcecomplete="true"
|
||||
minresultsforpopup="3"
|
||||
ontextentered="awRecipientTextCommand(eventParam, this)"
|
||||
|
|
Загрузка…
Ссылка в новой задаче