mirror of
https://github.com/moparisthebest/mail
synced 2024-11-22 17:02:17 -05:00
review mail-list
This commit is contained in:
Tankred Hase
parent
6a8bb527fc
commit
b093b069f6
@ -58,13 +58,13 @@ define(function(require) {
|
||||
// scope functions
|
||||
//
|
||||
|
||||
$scope.getContent = function(email) {
|
||||
$scope.getBody = function(email) {
|
||||
// don't stream message content of outbox messages...
|
||||
if (getFolder().type === 'Outbox') {
|
||||
return;
|
||||
}
|
||||
|
||||
emailDao.getMessageContent({
|
||||
emailDao.getBody({
|
||||
folder: getFolder().path,
|
||||
message: email
|
||||
}, function(error) {
|
||||
@ -410,43 +410,48 @@ define(function(require) {
|
||||
ngModule.directive('ngIscroll', function() {
|
||||
return {
|
||||
link: function(scope, elm, attrs) {
|
||||
var model = attrs.ngIscroll;
|
||||
var model = attrs.ngIscroll,
|
||||
listEl = elm[0];
|
||||
|
||||
scope.$watch(model, function() {
|
||||
var myScroll;
|
||||
// activate iscroll
|
||||
myScroll = new IScroll(elm[0], {
|
||||
mouseWheel: true,
|
||||
myScroll = new IScroll(listEl, {
|
||||
mouseWheel: true
|
||||
});
|
||||
|
||||
// load the visible message bodies, when the list is re-initialized and when scrolling stopped
|
||||
loadVisible();
|
||||
myScroll.on('scrollEnd', loadVisible);
|
||||
}, true);
|
||||
|
||||
function loadVisible() {
|
||||
var list = elm[0].getBoundingClientRect(),
|
||||
footerHeight = elm[0].nextElementSibling.getBoundingClientRect().height,
|
||||
top = list.top,
|
||||
bottom = list.bottom - footerHeight,
|
||||
listItems = elm[0].children[0].children,
|
||||
i = listItems.length,
|
||||
listItem, message,
|
||||
isPartiallyVisibleTop, isPartiallyVisibleBottom, isVisible;
|
||||
/*
|
||||
* iterates over the mails in the mail list and loads their bodies if they are visible in the viewport
|
||||
*/
|
||||
function loadVisible() {
|
||||
var listBorder = listEl.getBoundingClientRect(),
|
||||
top = listBorder.top,
|
||||
bottom = listBorder.bottom,
|
||||
listItems = listEl.children[0].children,
|
||||
i = listItems.length,
|
||||
listItem, message,
|
||||
isPartiallyVisibleTop, isPartiallyVisibleBottom, isVisible;
|
||||
|
||||
while (i--) {
|
||||
listItem = listItems.item(i).getBoundingClientRect();
|
||||
message = scope.filteredMessages[i];
|
||||
while (i--) {
|
||||
// the n-th list item (the dom representation of an email) corresponds to
|
||||
// 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
|
||||
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
|
||||
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
|
||||
isVisible = listItem.top >= top && listItem.bottom <= bottom; // the list item is visible as a whole
|
||||
|
||||
|
||||
if (isPartiallyVisibleTop || isVisible || isPartiallyVisibleBottom) {
|
||||
scope.getContent(message);
|
||||
}
|
||||
if (isPartiallyVisibleTop || isVisible || isPartiallyVisibleBottom) {
|
||||
scope.getBody(message);
|
||||
}
|
||||
}
|
||||
}, true);
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
@ -737,7 +737,7 @@ define(function(require) {
|
||||
* @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
|
||||
*/
|
||||
EmailDAO.prototype.getMessageContent = function(options, callback) {
|
||||
EmailDAO.prototype.getBody = function(options, callback) {
|
||||
var self = this,
|
||||
message = options.message,
|
||||
folder = options.folder;
|
||||
@ -1179,7 +1179,7 @@ define(function(require) {
|
||||
return;
|
||||
}
|
||||
|
||||
self._imapClient.streamPlaintext({
|
||||
self._imapClient.getBody({
|
||||
path: options.folder,
|
||||
message: options.message
|
||||
}, callback);
|
||||
|
||||
@ -821,7 +821,7 @@ define(function(require) {
|
||||
it('should work', function(done) {
|
||||
var path = 'FOLDAAAA';
|
||||
|
||||
imapClientStub.streamPlaintext.withArgs({
|
||||
imapClientStub.getBody.withArgs({
|
||||
path: path,
|
||||
message: {}
|
||||
}).yields(null, {});
|
||||
@ -833,16 +833,16 @@ define(function(require) {
|
||||
expect(err).to.not.exist;
|
||||
expect(msg).to.exist;
|
||||
|
||||
expect(imapClientStub.streamPlaintext.calledOnce).to.be.true;
|
||||
expect(imapClientStub.getBody.calledOnce).to.be.true;
|
||||
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should not work when streamPlaintext fails', function(done) {
|
||||
it('should not work when getBody fails', function(done) {
|
||||
var path = 'FOLDAAAA';
|
||||
|
||||
imapClientStub.streamPlaintext.yields({});
|
||||
imapClientStub.getBody.yields({});
|
||||
|
||||
dao._imapStreamText({
|
||||
folder: path,
|
||||
@ -851,7 +851,7 @@ define(function(require) {
|
||||
expect(err).to.exist;
|
||||
expect(msg).to.not.exist;
|
||||
|
||||
expect(imapClientStub.streamPlaintext.calledOnce).to.be.true;
|
||||
expect(imapClientStub.getBody.calledOnce).to.be.true;
|
||||
|
||||
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() {
|
||||
var message = {
|
||||
body: 'bender is great!'
|
||||
};
|
||||
|
||||
dao.getMessageContent({
|
||||
dao.getBody({
|
||||
message: message
|
||||
});
|
||||
|
||||
@ -959,7 +959,7 @@ define(function(require) {
|
||||
}]);
|
||||
|
||||
|
||||
dao.getMessageContent({
|
||||
dao.getBody({
|
||||
message: message,
|
||||
folder: folder
|
||||
}, function(err, msg) {
|
||||
@ -995,7 +995,7 @@ define(function(require) {
|
||||
}]);
|
||||
|
||||
|
||||
dao.getMessageContent({
|
||||
dao.getBody({
|
||||
message: message,
|
||||
folder: folder
|
||||
}, function(err, msg) {
|
||||
@ -1045,7 +1045,7 @@ define(function(require) {
|
||||
});
|
||||
|
||||
|
||||
dao.getMessageContent({
|
||||
dao.getBody({
|
||||
message: message,
|
||||
folder: folder
|
||||
}, function(err, msg) {
|
||||
@ -1096,7 +1096,7 @@ define(function(require) {
|
||||
});
|
||||
|
||||
|
||||
dao.getMessageContent({
|
||||
dao.getBody({
|
||||
message: message,
|
||||
folder: folder
|
||||
}, function(err, msg) {
|
||||
@ -1141,7 +1141,7 @@ define(function(require) {
|
||||
emails: [message]
|
||||
}).yields({});
|
||||
|
||||
dao.getMessageContent({
|
||||
dao.getBody({
|
||||
message: message,
|
||||
folder: folder
|
||||
}, function(err, msg) {
|
||||
@ -1178,7 +1178,7 @@ define(function(require) {
|
||||
|
||||
localStoreStub = sinon.stub(dao, '_localStoreMessages');
|
||||
|
||||
dao.getMessageContent({
|
||||
dao.getBody({
|
||||
message: message,
|
||||
folder: folder
|
||||
}, function(err, msg) {
|
||||
@ -1225,7 +1225,9 @@ define(function(require) {
|
||||
var message, parsedBody, mimeBody, parseStub;
|
||||
|
||||
message = {
|
||||
from: [{address: 'asdasdasd'}],
|
||||
from: [{
|
||||
address: 'asdasdasd'
|
||||
}],
|
||||
encrypted: true,
|
||||
decrypted: false,
|
||||
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);
|
||||
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.block).to.equal(mimeBody);
|
||||
|
||||
@ -1268,7 +1270,9 @@ define(function(require) {
|
||||
var message, plaintextBody, parseStub;
|
||||
|
||||
message = {
|
||||
from: [{address: 'asdasdasd'}],
|
||||
from: [{
|
||||
address: 'asdasdasd'
|
||||
}],
|
||||
encrypted: true,
|
||||
decrypted: false,
|
||||
body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----'
|
||||
@ -1303,7 +1307,9 @@ define(function(require) {
|
||||
var message, plaintextBody, parseStub, errMsg;
|
||||
|
||||
message = {
|
||||
from: [{address: 'asdasdasd'}],
|
||||
from: [{
|
||||
address: 'asdasdasd'
|
||||
}],
|
||||
encrypted: true,
|
||||
decrypted: false,
|
||||
body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----'
|
||||
@ -1340,7 +1346,9 @@ define(function(require) {
|
||||
var message, parseStub;
|
||||
|
||||
message = {
|
||||
from: [{address: 'asdasdasd'}],
|
||||
from: [{
|
||||
address: 'asdasdasd'
|
||||
}],
|
||||
encrypted: true,
|
||||
decrypted: false,
|
||||
body: '-----BEGIN PGP MESSAGE-----asdasdasd-----END PGP MESSAGE-----'
|
||||
|
||||
@ -225,7 +225,7 @@ define(function(require) {
|
||||
});
|
||||
});
|
||||
|
||||
describe('getContent', function() {
|
||||
describe('getBody', function() {
|
||||
it('should get the mail content', function() {
|
||||
scope.state.nav = {
|
||||
currentFolder: {
|
||||
@ -233,8 +233,8 @@ define(function(require) {
|
||||
}
|
||||
};
|
||||
|
||||
scope.getContent();
|
||||
expect(emailDaoMock.getMessageContent.calledOnce).to.be.true;
|
||||
scope.getBody();
|
||||
expect(emailDaoMock.getBody.calledOnce).to.be.true;
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user