amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-26 13:55:23 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_1' (head f6a0b62965278336b461dac36045bfae5fc07f0a)

Browse Source 
to branch 'ca.inverse.sogo' (head aa0663eb86f38080e2ab2d20b64f30547adbfa81)

Monotone-Parent: aa0663eb86f38080e2ab2d20b64f30547adbfa81
Monotone-Parent: f6a0b62965278336b461dac36045bfae5fc07f0a
Monotone-Revision: 0176ffcc344892f0535563789b246aea9810ee5e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-08-12T18:23:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2010-08-12 18:23:23 +00:00
parent f8e882ae36 89d3d4b413
commit 39626e8569
119 changed files with 2599 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/JavascriptAPIExtensions.js
+2 -2
View File
@@ -60,8 +60,8 @@ String.prototype.asDate = function () {
};
String.prototype.asCSSIdentifier = function() {
var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ' , "'" ];
var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_', '_SQ_' ];
var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ' , "'", '&' ];
var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_', '_SQ_', '_AM_' ];
var newString = this;
for (var i = 0; i < characters.length; i++) {
UI/WebServerResources/MailerUI.js
+2 -3
View File
@@ -553,7 +553,7 @@ function onMailboxMenuMove(event) {
deleteCachedMailbox(targetMailbox);
var url = ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/moveMessages";
var parameters = "uid=" + uids.join(",") + "&folder=" + targetMailbox;
var parameters = "uid=" + uids.join(",") + "&folder=" + encodeURIComponent(targetMailbox);
var data = { "id": uids, "mailbox": Mailer.currentMailbox, "path": paths, "folder": targetMailbox, "refresh": true };
triggerAjaxRequest(url, folderRefreshCallback, data, parameters,
{ "Content-type": "application/x-www-form-urlencoded" });
@@ -572,7 +572,6 @@ function onMailboxMenuCopy(event) {
targetMailbox = this.mailbox.fullName();
else // from DnD
targetMailbox = this.readAttribute("dataname");
for (var i = 0; i < rows.length; i++) {
var uid = rows[i].readAttribute("id").substr(4);
var path = Mailer.currentMailbox + "/" + uid;
@@ -584,7 +583,7 @@ function onMailboxMenuCopy(event) {
deleteCachedMailbox(targetMailbox);
var url = ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/copyMessages";
var parameters = "uid=" + uids.join(",") + "&folder=" + targetMailbox;
var parameters = "uid=" + uids.join(",") + "&folder=" + encodeURIComponent(targetMailbox);
var data = { "id": uids, "mailbox": Mailer.currentMailbox, "path": paths, "folder": targetMailbox, "refresh": false };
triggerAjaxRequest(url, folderRefreshCallback, data, parameters,
{ "Content-type": "application/x-www-form-urlencoded" });
UI/WebServerResources/UIxAclEditor.js
+7 -2
View File
@@ -36,14 +36,19 @@ function addUser(userName, userID) {
var elements = url.split("/");
elements[elements.length-1] = ("addUserInAcls?uid="
+ userID);
triggerAjaxRequest(elements.join("/"), addUserCallback);
triggerAjaxRequest(elements.join("/"), addUserCallback, newNode);
result = true;
}
return result;
}
function addUserCallback(http) {
// Ignore response
if (http.readyState == 4) {
if (!isHttpStatus204(http.status)) {
var node = http.callbackData;
node.parentNode.removeChild(node);
}
}
}
function setEventsOnUserNode(node) {