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

Merge pull request #20 from alexcloutier/fix/2616

Browse Source 
bugFix #0002616 : change the behavior of ApplicationBaseURL.
This commit is contained in:
extrafu
2014-04-07 15:44:07 -04:00
parent 534e4e3d4d 6ad87052ba
commit 4fe0358581
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
@@ -280,7 +280,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=');
@@ -312,7 +312,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;
}
@@ -491,7 +491,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"))
@@ -797,7 +797,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 = "";
@@ -873,7 +873,7 @@ function onAddressBookRemove(event) {
}
else {
var folderId = node.getAttribute("id");
var folderUrl = ApplicationBaseURL + folderId;
var folderUrl = ApplicationBaseURL + "/" + folderId;
unsubscribeFromFolder(folderUrl, owner, onFolderUnsubscribeCB, folderId);
}
}
@@ -899,7 +899,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);
@@ -1616,7 +1616,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=');