mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
Merge branch 'master' into addressbook
This commit is contained in:
commit
9861d1bf78
4 changed files with 5 additions and 5 deletions
|
|
@ -113,7 +113,7 @@ export class EmailAddressesComponent {
|
||||||
if (datalist.inputValue !== value) {
|
if (datalist.inputValue !== value) {
|
||||||
datalist.inputValue = value;
|
datalist.inputValue = value;
|
||||||
value.length && self.options.autoCompleteSource(
|
value.length && self.options.autoCompleteSource(
|
||||||
{term:value},
|
value,
|
||||||
items => {
|
items => {
|
||||||
self._resetDatalist();
|
self._resetDatalist();
|
||||||
items && items.forEach(item => datalist.append(new Option(item)));
|
items && items.forEach(item => datalist.append(new Option(item)));
|
||||||
|
|
|
||||||
|
|
@ -754,7 +754,7 @@ export class ComposePopupView extends AbstractViewPopup {
|
||||||
}
|
}
|
||||||
|
|
||||||
// getAutocomplete
|
// getAutocomplete
|
||||||
emailsSource(oData, fResponse) {
|
emailsSource(value, fResponse) {
|
||||||
Remote.request('Suggestions',
|
Remote.request('Suggestions',
|
||||||
(iError, data) => {
|
(iError, data) => {
|
||||||
if (!iError && isArray(data.Result)) {
|
if (!iError && isArray(data.Result)) {
|
||||||
|
|
@ -767,7 +767,7 @@ export class ComposePopupView extends AbstractViewPopup {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Query: oData.term
|
Query: value
|
||||||
// ,Page: 1
|
// ,Page: 1
|
||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ class ImapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
|
||||||
$oMailClient = $oActions->MailClient();
|
$oMailClient = $oActions->MailClient();
|
||||||
if (!$oMailClient->IsLoggined()) {
|
if (!$oMailClient->IsLoggined()) {
|
||||||
$oAccount = $oActions->getAccountFromToken();
|
$oAccount = $oActions->getAccountFromToken();
|
||||||
$oAccount->IncConnectAndLoginHelper($oActions->Plugins(), $oMailClient, $oActions->Config());
|
$oAccount->ImapConnectAndLoginHelper($oActions->Plugins(), $oMailClient, $oActions->Config());
|
||||||
}
|
}
|
||||||
$oImapClient = $oMailClient->ImapClient();
|
$oImapClient = $oMailClient->ImapClient();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
|
||||||
$oActions = \RainLoop\Api::Actions();
|
$oActions = \RainLoop\Api::Actions();
|
||||||
$oMailClient = $oActions->MailClient();
|
$oMailClient = $oActions->MailClient();
|
||||||
if (!$oMailClient->IsLoggined()) {
|
if (!$oMailClient->IsLoggined()) {
|
||||||
$oActions->getAccountFromToken()->IncConnectAndLoginHelper($oActions->Plugins(), $oMailClient, $oActions->Config());
|
$oActions->getAccountFromToken()->ImapConnectAndLoginHelper($oActions->Plugins(), $oMailClient, $oActions->Config());
|
||||||
}
|
}
|
||||||
return $oMailClient;
|
return $oMailClient;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue