moparisthebest
/
mail
mirror of https://github.com/moparisthebest/mail
1
0
Fork 0
Code Issues Releases Wiki Activity

review mail-list

This commit is contained in:
Tankred Hase 2014-02-20 15:42:51 +01:00
parent 6a8bb527fc
commit b093b069f6
4 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,13 +58,13 @@ define(function(require) {
// scope functions // scope functions
// //
$scope.getContent = function(email) { $scope.getBody = function(email) {
// don't stream message content of outbox messages... // don't stream message content of outbox messages...
if (getFolder().type === 'Outbox') { if (getFolder().type === 'Outbox') {
return; return;
} }
emailDao.getMessageContent({ emailDao.getBody({
folder: getFolder().path, folder: getFolder().path,
message: email message: email
}, function(error) { }, function(error) {
@ -410,43 +410,48 @@ define(function(require) {
ngModule.directive('ngIscroll', function() { ngModule.directive('ngIscroll', function() {
return { return {
link: function(scope, elm, attrs) { link: function(scope, elm, attrs) {
var model = attrs.ngIscroll; var model = attrs.ngIscroll,
listEl = elm[0];
scope.$watch(model, function() { scope.$watch(model, function() {
var myScroll; var myScroll;
// activate iscroll // activate iscroll
myScroll = new IScroll(elm[0], { myScroll = new IScroll(listEl, {
mouseWheel: true, mouseWheel: true
}); });
// load the visible message bodies, when the list is re-initialized and when scrolling stopped // load the visible message bodies, when the list is re-initialized and when scrolling stopped
loadVisible(); loadVisible();
myScroll.on('scrollEnd', loadVisible); myScroll.on('scrollEnd', loadVisible);
}, true);
function loadVisible() { /*
var list = elm[0].getBoundingClientRect(), * iterates over the mails in the mail list and loads their bodies if they are visible in the viewport
footerHeight = elm[0].nextElementSibling.getBoundingClientRect().height, */
top = list.top, function loadVisible() {
bottom = list.bottom - footerHeight, var listBorder = listEl.getBoundingClientRect(),
listItems = elm[0].children[0].children, top = listBorder.top,
i = listItems.length, bottom = listBorder.bottom,
listItem, message, listItems = listEl.children[0].children,
isPartiallyVisibleTop, isPartiallyVisibleBottom, isVisible; i = listItems.length,
listItem, message,
isPartiallyVisibleTop, isPartiallyVisibleBottom, isVisible;
while (i--) { while (i--) {
listItem = listItems.item(i).getBoundingClientRect(); // the n-th list item (the dom representation of an email) corresponds to
message = scope.filteredMessages[i]; // the n-th message model in the filteredMessages array
listItem = listItems.item(i).getBoundingClientRect();
message = scope.filteredMessages[i];
isPartiallyVisibleTop = listItem.top < top && listItem.bottom > top; // a portion of the list item is visible on the top isPartiallyVisibleTop = listItem.top < top && listItem.bottom > top; // a portion of the list item is visible on the top
isPartiallyVisibleBottom = listItem.top < bottom && listItem.bottom > bottom; // a portion of the list item is visible on the bottom isPartiallyVisibleBottom = listItem.top < bottom && listItem.bottom > bottom; // a portion of the list item is visible on the bottom
isVisible = listItem.top >= top && listItem.bottom <= bottom; // the list item is visible as a whole isVisible = listItem.top >= top && listItem.bottom <= bottom; // the list item is visible as a whole
if (isPartiallyVisibleTop || isVisible || isPartiallyVisibleBottom) {
if (isPartiallyVisibleTop || isVisible || isPartiallyVisibleBottom) { scope.getBody(message);
scope.getContent(message);
}
} }
} }
}, true); }
} }
}; };
}); });

4
src/js/dao/email-dao.js
View File

@ -737,7 +737,7 @@ define(function(require) {
* @param {Object} options.folder The IMAP folder * @param {Object} options.folder The IMAP folder
* @param {Function} callback(error, message) Invoked when the message is streamed, or provides information if an error occurred * @param {Function} callback(error, message) Invoked when the message is streamed, or provides information if an error occurred
*/ */
EmailDAO.prototype.getMessageContent = function(options, callback) { EmailDAO.prototype.getBody = function(options, callback) {
var self = this, var self = this,
message = options.message, message = options.message,
folder = options.folder; folder = options.folder;
@ -1179,7 +1179,7 @@ define(function(require) {
return; return;
} }
self._imapClient.streamPlaintext({ self._imapClient.getBody({
path: options.folder, path: options.folder,
message: options.message message: options.message
}, callback); }, callback);

70
test/new-unit/email-dao-test.js
View File

@ -821,7 +821,7 @@ define(function(require) {
it('should work', function(done) { it('should work', function(done) {
var path = 'FOLDAAAA'; var path = 'FOLDAAAA';
imapClientStub.streamPlaintext.withArgs({ imapClientStub.getBody.withArgs({
path: path, path: path,
message: {} message: {}
}).yields(null, {}); }).yields(null, {});
@ -833,16 +833,16 @@ define(function(require) {
expect(err).to.not.exist; expect(err).to.not.exist;
expect(msg).to.exist; expect(msg).to.exist;
expect(imapClientStub.streamPlaintext.calledOnce).to.be.true; expect(imapClientStub.getBody.calledOnce).to.be.true;
done(); done();
}); });
}); });
it('should not work when streamPlaintext fails', function(done) { it('should not work when getBody fails', function(done) {
var path = 'FOLDAAAA'; var path = 'FOLDAAAA';
imapClientStub.streamPlaintext.yields({}); imapClientStub.getBody.yields({});
dao._imapStreamText({ dao._imapStreamText({
folder: path, folder: path,
@ -851,7 +851,7 @@ define(function(require) {
expect(err).to.exist; expect(err).to.exist;
expect(msg).to.not.exist; expect(msg).to.not.exist;
expect(imapClientStub.streamPlaintext.calledOnce).to.be.true; expect(imapClientStub.getBody.calledOnce).to.be.true;
done(); done();
}); });
@ -928,13 +928,13 @@ define(function(require) {
}); });
}); });
describe('getMessageContent', function() { describe('getBody', function() {
it('should not do anything if the message already has content', function() { it('should not do anything if the message already has content', function() {
var message = { var message = {
body: 'bender is great!' body: 'bender is great!'
}; };
dao.getMessageContent({ dao.getBody({
message: message message: message
}); });
@ -959,12 +959,12 @@ define(function(require) {
}]); }]);
dao.getMessageContent({ dao.getBody({
message: message, message: message,
folder: folder folder: folder
}, function(err, msg) { }, function(err, msg) {
expect(err).to.not.exist; expect(err).to.not.exist;
expect(msg).to.equal(message); expect(msg).to.equal(message);
expect(msg.body).to.not.be.empty; expect(msg.body).to.not.be.empty;
expect(msg.encrypted).to.be.false; expect(msg.encrypted).to.be.false;
@ -995,18 +995,18 @@ define(function(require) {
}]); }]);
dao.getMessageContent({ dao.getBody({
message: message, message: message,
folder: folder folder: folder
}, function(err, msg) { }, function(err, msg) {
expect(err).to.not.exist; expect(err).to.not.exist;
expect(msg).to.equal(message); expect(msg).to.equal(message);
expect(msg.body).to.not.be.empty; expect(msg.body).to.not.be.empty;
expect(msg.encrypted).to.be.true; expect(msg.encrypted).to.be.true;
expect(msg.decrypted).to.be.false; expect(msg.decrypted).to.be.false;
expect(message.loadingBody).to.be.false; expect(message.loadingBody).to.be.false;
expect(localListStub.calledOnce).to.be.true; expect(localListStub.calledOnce).to.be.true;
done(); done();
@ -1045,7 +1045,7 @@ define(function(require) {
}); });
dao.getMessageContent({ dao.getBody({
message: message, message: message,
folder: folder folder: folder
}, function(err, msg) { }, function(err, msg) {
@ -1096,18 +1096,18 @@ define(function(require) {
}); });
dao.getMessageContent({ dao.getBody({
message: message, message: message,
folder: folder folder: folder
}, function(err, msg) { }, function(err, msg) {
expect(err).to.not.exist; expect(err).to.not.exist;
expect(msg).to.equal(message); expect(msg).to.equal(message);
expect(msg.body).to.not.be.empty; expect(msg.body).to.not.be.empty;
expect(msg.encrypted).to.be.true; expect(msg.encrypted).to.be.true;
expect(msg.decrypted).to.be.false; expect(msg.decrypted).to.be.false;
expect(msg.loadingBody).to.be.false; expect(msg.loadingBody).to.be.false;
expect(localListStub.calledOnce).to.be.true; expect(localListStub.calledOnce).to.be.true;
expect(imapStreamStub.calledOnce).to.be.true; expect(imapStreamStub.calledOnce).to.be.true;
expect(localStoreStub.calledOnce).to.be.true; expect(localStoreStub.calledOnce).to.be.true;
@ -1141,7 +1141,7 @@ define(function(require) {
emails: [message] emails: [message]
}).yields({}); }).yields({});
dao.getMessageContent({ dao.getBody({
message: message, message: message,
folder: folder folder: folder
}, function(err, msg) { }, function(err, msg) {
@ -1178,7 +1178,7 @@ define(function(require) {
localStoreStub = sinon.stub(dao, '_localStoreMessages'); localStoreStub = sinon.stub(dao, '_localStoreMessages');
dao.getMessageContent({ dao.getBody({
message: message, message: message,
folder: folder folder: folder
}, function(err, msg) { }, function(err, msg) {
@ -1225,7 +1225,9 @@ define(function(require) {
var message, parsedBody, mimeBody, parseStub; var message, parsedBody, mimeBody, parseStub;
message = { message = {
from: [{address: 'asdasdasd'}], from: [{
address: 'asdasdasd'
}],
encrypted: true, encrypted: true,
decrypted: false, decrypted: false,
body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----' body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----'
@ -1236,7 +1238,7 @@ define(function(require) {
keychainStub.getReceiverPublicKey.withArgs(message.from[0].address).yieldsAsync(null, mockKeyPair.publicKey); keychainStub.getReceiverPublicKey.withArgs(message.from[0].address).yieldsAsync(null, mockKeyPair.publicKey);
pgpStub.decrypt.withArgs(message.body, mockKeyPair.publicKey.publicKey).yieldsAsync(null, mimeBody); pgpStub.decrypt.withArgs(message.body, mockKeyPair.publicKey.publicKey).yieldsAsync(null, mimeBody);
parseStub = sinon.stub(dao, '_imapParseMessageBlock', function(o, cb){ parseStub = sinon.stub(dao, '_imapParseMessageBlock', function(o, cb) {
expect(o.message).to.equal(message); expect(o.message).to.equal(message);
expect(o.block).to.equal(mimeBody); expect(o.block).to.equal(mimeBody);
@ -1248,12 +1250,12 @@ define(function(require) {
message: message message: message
}, function(error, msg) { }, function(error, msg) {
expect(error).to.not.exist; expect(error).to.not.exist;
expect(msg).to.equal(message); expect(msg).to.equal(message);
expect(msg.decrypted).to.be.true; expect(msg.decrypted).to.be.true;
expect(msg.body).to.equal(parsedBody); expect(msg.body).to.equal(parsedBody);
expect(msg.decryptingBody).to.be.false; expect(msg.decryptingBody).to.be.false;
expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true; expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true;
expect(pgpStub.decrypt.calledOnce).to.be.true; expect(pgpStub.decrypt.calledOnce).to.be.true;
expect(parseStub.calledOnce).to.be.true; expect(parseStub.calledOnce).to.be.true;
@ -1268,7 +1270,9 @@ define(function(require) {
var message, plaintextBody, parseStub; var message, plaintextBody, parseStub;
message = { message = {
from: [{address: 'asdasdasd'}], from: [{
address: 'asdasdasd'
}],
encrypted: true, encrypted: true,
decrypted: false, decrypted: false,
body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----' body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----'
@ -1284,12 +1288,12 @@ define(function(require) {
message: message message: message
}, function(error, msg) { }, function(error, msg) {
expect(error).to.not.exist; expect(error).to.not.exist;
expect(msg).to.equal(message); expect(msg).to.equal(message);
expect(msg.decrypted).to.be.true; expect(msg.decrypted).to.be.true;
expect(msg.body).to.equal(plaintextBody); expect(msg.body).to.equal(plaintextBody);
expect(msg.decryptingBody).to.be.false; expect(msg.decryptingBody).to.be.false;
expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true; expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true;
expect(pgpStub.decrypt.calledOnce).to.be.true; expect(pgpStub.decrypt.calledOnce).to.be.true;
expect(parseStub.called).to.be.false; expect(parseStub.called).to.be.false;
@ -1303,7 +1307,9 @@ define(function(require) {
var message, plaintextBody, parseStub, errMsg; var message, plaintextBody, parseStub, errMsg;
message = { message = {
from: [{address: 'asdasdasd'}], from: [{
address: 'asdasdasd'
}],
encrypted: true, encrypted: true,
decrypted: false, decrypted: false,
body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----' body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----'
@ -1322,7 +1328,7 @@ define(function(require) {
message: message message: message
}, function(error, msg) { }, function(error, msg) {
expect(error).to.not.exist; expect(error).to.not.exist;
expect(msg).to.equal(message); expect(msg).to.equal(message);
expect(msg.decrypted).to.be.true; expect(msg.decrypted).to.be.true;
expect(msg.body).to.equal(errMsg); expect(msg.body).to.equal(errMsg);
@ -1340,7 +1346,9 @@ define(function(require) {
var message, parseStub; var message, parseStub;
message = { message = {
from: [{address: 'asdasdasd'}], from: [{
address: 'asdasdasd'
}],
encrypted: true, encrypted: true,
decrypted: false, decrypted: false,
body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----' body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----'
@ -1353,12 +1361,12 @@ define(function(require) {
message: message message: message
}, function(error, msg) { }, function(error, msg) {
expect(error).to.exist; expect(error).to.exist;
expect(msg).to.not.exist; expect(msg).to.not.exist;
expect(message.decrypted).to.be.false; expect(message.decrypted).to.be.false;
expect(message.decryptingBody).to.be.false; expect(message.decryptingBody).to.be.false;
expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true; expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true;
expect(pgpStub.decrypt.called).to.be.false; expect(pgpStub.decrypt.called).to.be.false;
expect(parseStub.called).to.be.false; expect(parseStub.called).to.be.false;

6
test/new-unit/mail-list-ctrl-test.js
View File

@ -225,7 +225,7 @@ define(function(require) {
}); });
}); });
describe('getContent', function() { describe('getBody', function() {
it('should get the mail content', function() { it('should get the mail content', function() {
scope.state.nav = { scope.state.nav = {
currentFolder: { currentFolder: {
@ -233,8 +233,8 @@ define(function(require) {
} }
}; };
scope.getContent(); scope.getBody();
expect(emailDaoMock.getMessageContent.calledOnce).to.be.true; expect(emailDaoMock.getBody.calledOnce).to.be.true;
}); });
}); });