mirror of
https://github.com/moparisthebest/mail
synced 2024-12-24 08:18:48 -05:00
Merge branch 'master' into dev/attachments-ui
This commit is contained in:
commit
cb69514197
@ -123,7 +123,19 @@ define(function(require) {
|
||||
console.log('IMAP error.', err);
|
||||
console.log('IMAP reconnecting...');
|
||||
// re-init client modules on error
|
||||
self.onConnect(callback);
|
||||
self.onConnect(function(err) {
|
||||
if (!self._initialized) {
|
||||
callback(err);
|
||||
return;
|
||||
}
|
||||
|
||||
if (err) {
|
||||
console.error('IMAP reconnect failed!', err);
|
||||
return;
|
||||
}
|
||||
|
||||
console.log('IMAP reconnect attempt complete.');
|
||||
});
|
||||
};
|
||||
|
||||
// connect to clients
|
||||
|
@ -19,6 +19,9 @@ define(function(require) {
|
||||
// attach global error handler
|
||||
errorUtil.attachHandler($scope);
|
||||
|
||||
// app controller is initialized
|
||||
appController._initialized = true;
|
||||
|
||||
emailDao = appController._emailDao;
|
||||
outboxBo = appController._outboxBo;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user