amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-10 07:48:52 +00:00
Code Issues Projects Releases Wiki Activity

merge of 'ced6d6c76d948b5a599e3ca67efeab0f03c99111'

Browse Source 
and 'ed40a4a9e9d163d3485ee9181074ef26215a9f2e'

Monotone-Parent: ced6d6c76d948b5a599e3ca67efeab0f03c99111
Monotone-Parent: ed40a4a9e9d163d3485ee9181074ef26215a9f2e
Monotone-Revision: 909eda2dfa5708b168adc8b891a2217b109db587

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-02T19:11:03
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-11-02 19:11:03 +00:00
parent b7ba11be61 ad53fa5812
commit 2ab1e11e59
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
UI/WebServerResources/MailerUI.js
View File

@@ -6,7 +6,7 @@ if (typeof textMailAccounts != 'undefined') {
if (textMailAccounts.length > 0)
mailAccounts = textMailAccounts.evalJSON(true);
else
mailAccounts = new Array;
mailAccounts = new Array();
}
var currentMessages = new Array();
@@ -527,7 +527,6 @@ function quotasCallback(http) {
&& http.status == 200) {
var hasQuotas = false;
if (http.responseText.length > 0) {
var quotas = http.responseText.evalJSON(true);
for (var i in quotas) {
hasQuotas = true;
@@ -1285,16 +1284,18 @@ function onLoadMailboxesCallback(http) {
if (http.readyState == 4
&& http.status == 200) {
checkAjaxRequestsState();
var newAccount = buildMailboxes(http.callbackData,
http.responseText);
accounts[http.callbackData] = newAccount;
mailboxTree.addMailAccount(newAccount);
mailboxTree.pendingRequests--;
activeAjaxRequests--;
if (!mailboxTree.pendingRequests) {
updateMailboxTreeInPage();
updateMailboxMenus();
checkAjaxRequestsState();
if (http.responseText.length > 0) {
var newAccount = buildMailboxes(http.callbackData,
http.responseText);
accounts[http.callbackData] = newAccount;
mailboxTree.addMailAccount(newAccount);
mailboxTree.pendingRequests--;
activeAjaxRequests--;
if (!mailboxTree.pendingRequests) {
updateMailboxTreeInPage();
updateMailboxMenus();
checkAjaxRequestsState();
}
}
}

5
UI/WebServerResources/UIxMailEditor.js
View File

@@ -30,7 +30,7 @@ function addContact(tag, fullContactName, contactId, contactName, contactEmail)
var counter = 0;
var currentRow = $('row_' + counter);
while (currentRow && !stop) {
var currentValue = $(currentRow.childNodesWithTag("span")[1]).childNodesWithTag("input")[0].value;
var currentValue = $(currentRow.childNodesWithTag("td")[1]).childNodesWithTag("input")[0].value;
if (currentValue == neededOptionValue) {
stop = true;
insertContact($("addr_" + counter), contactName, contactEmail);
@@ -41,9 +41,10 @@ function addContact(tag, fullContactName, contactId, contactName, contactEmail)
if (!stop) {
fancyAddRow(false, "");
$("row_" + counter).childNodesWithTag("span")[0].childNodesWithTag("select")[0].value
$($("row_" + counter).childNodesWithTag("td")[0]).childNodesWithTag("select")[0].value
= neededOptionValue;
insertContact($("addr_" + counter), contactName, contactEmail);
onWindowResize(null);
}
}
}