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

Call () in onError handler to cleanup controller

Browse Source
This commit is contained in:
Tankred Hase 2013-11-14 23:57:06 +01:00
parent f23dee9369
commit 8bbb7d7d34
7 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/controller/login-existing.js
View File

@ -55,7 +55,6 @@ define(function(require) {
$scope.incorrect = true; $scope.incorrect = true;
$scope.buttonEnabled = true; $scope.buttonEnabled = true;
$scope.onError(err); $scope.onError(err);
$scope.$apply();
} }
}; };

11
src/js/controller/login-initial.js
View File

@ -38,12 +38,13 @@ define(function(require) {
setTimeout(function() { setTimeout(function() {
emailDao.unlock({}, passphrase, function(err) { emailDao.unlock({}, passphrase, function(err) {
if (err) { if (err) {
$scope.setState(states.IDLE);
$scope.onError(err); $scope.onError(err);
$scope.setState(states.IDLE, true);
return; return;
} }
$scope.setState(states.DONE, true); $scope.setState(states.DONE);
$scope.$apply();
}); });
}, 500); }, 500);
}; };
@ -78,12 +79,8 @@ define(function(require) {
$location.path('/desktop'); $location.path('/desktop');
}; };
$scope.setState = function(state, async) { $scope.setState = function(state) {
$scope.state.ui = state; $scope.state.ui = state;
if (async) {
$scope.$apply();
}
}; };
}; };

1
src/js/controller/login-new-device.js
View File

@ -43,7 +43,6 @@ define(function(require) {
if (err) { if (err) {
$scope.incorrect = true; $scope.incorrect = true;
$scope.onError(err); $scope.onError(err);
$scope.$apply();
return; return;
} }

15
src/js/controller/mail-list.js
View File

@ -162,9 +162,8 @@ define(function(require) {
function moved(err) { function moved(err) {
if (err) { if (err) {
$scope.onError(err);
$scope.emails.splice(index, 0, email); $scope.emails.splice(index, 0, email);
$scope.$apply(); $scope.onError(err);
return; return;
} }
} }
@ -227,9 +226,8 @@ define(function(require) {
function syncImapFolder(options, callback) { function syncImapFolder(options, callback) {
emailDao.unreadMessages(getFolder().path, function(err, unreadCount) { emailDao.unreadMessages(getFolder().path, function(err, unreadCount) {
if (err) { if (err) {
$scope.onError(err);
updateStatus('Error on sync!'); updateStatus('Error on sync!');
$scope.$apply(); $scope.onError(err);
return; return;
} }
// set unread count in folder model // set unread count in folder model
@ -238,9 +236,8 @@ define(function(require) {
emailDao.imapSync(options, function(err) { emailDao.imapSync(options, function(err) {
if (err) { if (err) {
$scope.onError(err);
updateStatus('Error on sync!'); updateStatus('Error on sync!');
$scope.$apply(); $scope.onError(err);
return; return;
} }
@ -253,9 +250,8 @@ define(function(require) {
firstSelect = true; firstSelect = true;
emailDao.listMessages(options, function(err, emails) { emailDao.listMessages(options, function(err, emails) {
if (err) { if (err) {
$scope.onError(err);
updateStatus('Error listing cache!'); updateStatus('Error listing cache!');
$scope.$apply(); $scope.onError(err);
return; return;
} }
@ -313,9 +309,8 @@ define(function(require) {
uid: email.uid uid: email.uid
}, function(err) { }, function(err) {
if (err) { if (err) {
$scope.onError(err);
updateStatus('Error marking read!'); updateStatus('Error marking read!');
$scope.$apply(); $scope.onError(err);
return; return;
} }
}); });

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

@ -59,8 +59,8 @@ define(function(require) {
// get last item from outbox // get last item from outbox
emailDao._devicestorage.listItems(dbType, 0, null, function(err, pending) { emailDao._devicestorage.listItems(dbType, 0, null, function(err, pending) {
if (err) { if (err) {
$scope.onError(err);
outboxBusy = false; outboxBusy = false;
$scope.onError(err);
return; return;
} }
@ -82,8 +82,8 @@ define(function(require) {
var email = emails.shift(); var email = emails.shift();
emailDao.smtpSend(email, function(err) { emailDao.smtpSend(email, function(err) {
if (err) { if (err) {
$scope.onError(err);
outboxBusy = false; outboxBusy = false;
$scope.onError(err);
return; return;
} }
@ -94,10 +94,10 @@ define(function(require) {
function removeFromStorage(id) { function removeFromStorage(id) {
if (!id) { if (!id) {
outboxBusy = false;
$scope.onError({ $scope.onError({
errMsg: 'Cannot remove email from storage without a valid id!' errMsg: 'Cannot remove email from storage without a valid id!'
}); });
outboxBusy = false;
return; return;
} }
@ -105,8 +105,8 @@ define(function(require) {
var key = dbType + '_' + id; var key = dbType + '_' + id;
emailDao._devicestorage.removeList(key, function(err) { emailDao._devicestorage.removeList(key, function(err) {
if (err) { if (err) {
$scope.onError(err);
outboxBusy = false; outboxBusy = false;
$scope.onError(err);
return; return;
} }

6
src/js/controller/write.js
View File

@ -140,7 +140,8 @@ define(function(require) {
to = $scope.to.replace(/\s/g, '').split(/[,;]/); to = $scope.to.replace(/\s/g, '').split(/[,;]/);
if (!to || to.length < 1) { if (!to || to.length < 1) {
$scope.onError({ $scope.onError({
errMsg: 'Seperate recipients with a comma!' errMsg: 'Seperate recipients with a comma!',
sync: true
}); });
return; return;
} }
@ -148,7 +149,8 @@ define(function(require) {
// only allow secure recipients until invitation is implemented // only allow secure recipients until invitation is implemented
if (!$scope.toKey) { if (!$scope.toKey) {
$scope.onError({ $scope.onError({
errMsg: 'Invitations not yet supported!' errMsg: 'Invitations not yet supported!',
sync: true
}); });
return; return;
} }

4
src/js/util/error.js
View File

@ -16,6 +16,10 @@ define(function() {
title: options.title || 'Error', title: options.title || 'Error',
message: options.errMsg || options.message message: options.errMsg || options.message
}; };
// don't call apply for synchronous calls
if (!options.sync) {
scope.$apply();
}
}; };
}; };