merge of '2a121cef9785165904cbe9effa330ad47ba45099'

and '9f129d083b11ce7ac964a083c351d2a15f16fbdb'

Monotone-Parent: 2a121cef9785165904cbe9effa330ad47ba45099
Monotone-Parent: 9f129d083b11ce7ac964a083c351d2a15f16fbdb
Monotone-Revision: ef0808300fb0a2f855c131c8d4958cef75bb1a1c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-11T13:33:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2010-08-11 13:33:02 +00:00
commit 0c4d4b099e
4 files changed
+24 -8

No files matched your search

+2 -5
View File
@@ -622,7 +622,7 @@ function composeNewMessage() {
}
}
function openMailbox(mailbox, reload, updateStatus) {
function openMailbox(mailbox, reload) {
if (mailbox != Mailer.currentMailbox || reload) {
var url = ApplicationBaseURL + encodeURI(mailbox);
var urlParams = new Hash();
@@ -691,9 +691,6 @@ function openMailbox(mailbox, reload, updateStatus) {
loadMessage(currentMessage);
}
}
if (updateStatus != false)
getStatusFolders();
}
}
@@ -1672,7 +1669,7 @@ function refreshContacts() {
function openInbox(node) {
var done = false;
openMailbox(node.parentNode.getAttribute("dataname"), false, false);
openMailbox(node.parentNode.getAttribute("dataname"), false);
var tree = $("mailboxTree");
tree.selectedEntry = node;
node.selectElement();
+1 -1
View File
@@ -772,7 +772,7 @@ function log(message) {
return;
}
if (message[message.length-1] == "\n") {
message = message.substr(0, message.length-2);
message = message.substr(0, message.length-1);
}
var lines = message.split("\n");
for (var i = 0; i < lines.length; i++) {