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

bugFix #0002616 : change the behavior of ApplicationBaseURL. Now the object return a standard path(without a slash at the end of the path) That means every string added the URL ApplicationBaseURL must start with a Slash.

Browse Source
This commit is contained in:
Alexandre Cloutier
2014-03-06 14:47:54 -05:00
parent 31ace947cb
commit 6ad87052ba
12 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/MailerUI.js
+8 -7
View File
@@ -40,7 +40,8 @@ function URLForFolderID(folderID, application) {
application = UserFolderURL + application + "/";
else
application = ApplicationBaseURL;
var url = application + encodeURI(folderID.substr(1));
var url = application + encodeURI(folderID);
if (url[url.length-1] == '/')
url = url.substr(0, url.length-1);
@@ -563,7 +564,7 @@ function deleteSelectedMessagesCallback(http) {
}
function deleteMessagesWithoutTrash(data) {
var url = ApplicationBaseURL + encodeURI(data["mailbox"]) + "/batchDelete";
var url = ApplicationBaseURL + encodeURI(data["/mailbox"]) + "/batchDelete";
var parameters = "uid=" + data["id"].join(",") + '&withoutTrash=1';
data["withoutTrash"] = true;
triggerAjaxRequest(url, deleteSelectedMessagesCallback, data, parameters,
@@ -767,7 +768,7 @@ function composeNewMessage() {
else
account = null;
if (account) {
var url = ApplicationBaseURL + encodeURI(account) + "/compose";
var url = ApplicationBaseURL + encodeURI("/" + account) + "/compose";
openMailComposeWindow(url);
}
}
@@ -1601,7 +1602,7 @@ function onReadMessageConfirmMDN(event) {
var messageURL;
if (window.opener && window.opener.Mailer) {
/* from UIxMailPopupView */
messageURL = (ApplicationBaseURL + encodeURI(mailboxName)
messageURL = (ApplicationBaseURL + encodeURI("/" + mailboxName)
+ "/" + messageName);
}
else {
@@ -2020,7 +2021,7 @@ function initMailboxTree() {
var chainRq = new AjaxRequestsChain(initMailboxTreeCB);
for (var i = 0; i < mailAccounts.length; i++) {
var url = ApplicationBaseURL + i + "/mailboxes";
var url = ApplicationBaseURL + "/" + i + "/mailboxes";
chainRq.requests.push([url, onLoadMailboxesCallback, i]);
}
chainRq.start();
@@ -2255,7 +2256,7 @@ function buildMailboxes(accountIdx, encoded) {
function getFoldersState() {
if (mailAccounts.length > 0) {
var urlstr = ApplicationBaseURL + "foldersState";
var urlstr = ApplicationBaseURL + "/foldersState";
triggerAjaxRequest(urlstr, getFoldersStateCallback);
}
}
@@ -2279,7 +2280,7 @@ function getFoldersStateCallback(http) {
function saveFoldersState() {
if (mailAccounts.length > 0) {
var foldersState = mailboxTree.getFoldersState();
var urlstr = ApplicationBaseURL + "saveFoldersState";
var urlstr = ApplicationBaseURL + "/saveFoldersState";
var parameters = "expandedFolders=" + foldersState;
triggerAjaxRequest(urlstr, saveFoldersStateCallback, null, parameters,
{ "Content-type": "application/x-www-form-urlencoded" });