amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-13 15:35:30 +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-04 13:23:55 -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/ContactsUI.js
+7 -7
View File
@@ -258,7 +258,7 @@ function _onContactMenuAction(folderItem, action, refresh) {
}
}
var url = ApplicationBaseURL + selectedFolderId + "/" + action;
var url = ApplicationBaseURL + "/" + selectedFolderId + "/" + action;
var uids = contactIds.collect(function (s) {
return encodeURIComponent(s.unescapeHTML());
}).join('&uid=');
@@ -290,7 +290,7 @@ function onMenuExportContact (event) {
var contactIds = document.menuTarget.collect(function(row) {
return row.readAttribute("id");
});
var url = ApplicationBaseURL + selectedFolderId + "/export"
var url = ApplicationBaseURL + "/" + selectedFolderId + "/export"
+ "?uid=" + contactIds.join("&uid=");
window.location.href = url;
}
@@ -469,7 +469,7 @@ function onToolbarWriteToSelectedContacts(event) {
showAlertDialog(_("Please select a contact."));
}
else {
openMailComposeWindow(ApplicationBaseURL + "../Mail/compose"
openMailComposeWindow(ApplicationBaseURL + "/../Mail/compose"
+ "?folder=" + Contact.currentAddressBook.substring(1)
+ "&uid=" + rows.join("&uid="));
if (document.body.hasClassName("popup"))
@@ -777,7 +777,7 @@ function onAddressBookImport(event) {
var node = $("contactFolders").getSelectedNodes().first();
var folderId = node.getAttribute("id");
var url = ApplicationBaseURL + folderId + "/import";
var url = ApplicationBaseURL + "/" + folderId + "/import";
$("uploadForm").action = url;
$("contactsFile").value = "";
@@ -853,7 +853,7 @@ function onAddressBookRemove(event) {
}
else {
var folderId = node.getAttribute("id");
var folderUrl = ApplicationBaseURL + folderId;
var folderUrl = ApplicationBaseURL + "/" + folderId;
unsubscribeFromFolder(folderUrl, owner, onFolderUnsubscribeCB, folderId);
}
}
@@ -879,7 +879,7 @@ function deletePersonalAddressBookConfirm(folderId) {
document.deletePersonalABAjaxRequest.aborted = true;
document.deletePersonalABAjaxRequest.abort();
}
var url = ApplicationBaseURL + folderId + "/delete";
var url = ApplicationBaseURL + "/" + folderId + "/delete";
document.deletePersonalABAjaxRequest
= triggerAjaxRequest(url, deletePersonalAddressBookCallback, folderId);
@@ -1596,7 +1596,7 @@ function dropSelectedContacts(action, toId) {
if ((!currentFolderIsRemote() || action != "move")
&& fromId.substring(1) != toId) {
var url = ApplicationBaseURL + fromId + "/" + action;
var url = ApplicationBaseURL + "/" + fromId + "/" + action;
var uids = contactIds.collect(function (s) {
return encodeURIComponent(s.unescapeHTML());
}).join('&uid=');