moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2025-01-11 13:38:02 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into dev/attachments-ui

Browse Source
This commit is contained in:
Tankred Hase 2014-02-05 18:04:39 +01:00
commit cb69514197
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/app-controller.js
View File

@ -123,7 +123,19 @@ define(function(require) {
console.log('IMAP error.', err); console.log('IMAP error.', err);
console.log('IMAP reconnecting...'); console.log('IMAP reconnecting...');
// re-init client modules on error // 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 // connect to clients

3
src/js/controller/navigation.js
View File

@ -19,6 +19,9 @@ define(function(require) {
// attach global error handler // attach global error handler
errorUtil.attachHandler($scope); errorUtil.attachHandler($scope);
// app controller is initialized
appController._initialized = true;
emailDao = appController._emailDao; emailDao = appController._emailDao;
outboxBo = appController._outboxBo; outboxBo = appController._outboxBo;