LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed an error when unsubscribing from an addressbook in a popup window in the web interface. 

Monotone-Parent: a73f76eb898b4da5d09ab8b2ab40534bf749f3f4
Monotone-Revision: 1557ba13bc93ac186e2e592e204980df8a2a34c0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-09-04T19:08:21
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2009-09-04 19:08:21 +00:00
parent 60b68ee8f7
commit 2f84f000b1
3 changed files with 11 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UI/WebServerResources/ContactsUI.js
View File

@ -726,7 +726,8 @@ function onAddressBookRemove(event) {
}
else {
var folderId = node.getAttribute("id");
unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId);
var folderUrl = ApplicationBaseURL + folderId;
unsubscribeFromFolder(folderUrl, owner, onFolderUnsubscribeCB, folderId);
}
}

6
UI/WebServerResources/SchedulerUI.js
View File

@ -2069,9 +2069,11 @@ function onCalendarRemove(event) {
deletePersonalCalendar(folderIdElements[0]);
}
}
else
unsubscribeFromFolder(folderId, owner,
else {
var folderUrl = ApplicationBaseURL + folderId;
unsubscribeFromFolder(folderUrl, owner,
onFolderUnsubscribeCB, folderId);
}
}
}

59
UI/WebServerResources/generic.js
View File

@ -47,43 +47,6 @@ var Alarms = new Array();
var activeAjaxRequests = 0;
var removeFolderRequestCount = 0;
/* a W3C compliant document.all */
function getAllScopeElements(scope) {
var elements = new Array();
for (var i = 0; i < scope.childNodes.length; i++)
if (typeof(scope.childNodes[i]) == "object"
&& scope.childNodes[i].tagName
&& scope.childNodes[i].tagName != '')
{
elements.push(scope.childNodes[i]);
var childElements = getAllElements(scope.childNodes[i]);
if (childElements.length > 0)
elements.push(childElements);
}
return elements;
}
function getAllElements(scope) {
var elements;
if (scope == null)
scope = document;
if (scope == document
&& allDocumentElements != null)
elements = allDocumentElements;
else
{
elements = getAllScopeElements(scope);
if (scope == document)
allDocumentElements = elements;
}
return elements;
}
function createElement(tagName, id, classes,
attributes, htmlAttributes,
parentNode) {
@ -109,18 +72,6 @@ function createElement(tagName, id, classes,
return $(newElement);
}
function ml_stripActionInURL(url) {
if (url[url.length - 1] != '/') {
var i;
i = url.lastIndexOf("/");
if (i != -1) url = url.substring(0, i);
}
if (url[url.length - 1] != '/') // ensure trailing slash
url = url + "/";
return url;
}
function URLForFolderID(folderID) {
var folderInfos = folderID.split(":");
var url;
@ -340,7 +291,7 @@ function triggerAjaxRequest(url, callback, userdata, content, headers) {
if (http) {
activeAjaxRequests++;
document.animTimer = setTimeout("checkAjaxRequestsState();", 250);
http.open("POST", url, true);
http.url = url;
http.callback = callback;
@ -1111,17 +1062,17 @@ function folderUnsubscriptionCallback(http) {
}
}
function unsubscribeFromFolder(folder, owner, refreshCallback,
function unsubscribeFromFolder(folderUrl, owner, refreshCallback,
refreshCallbackData) {
if (document.body.hasClassName("popup")) {
window.opener.unsubscribeFromFolder(folder, refreshCallback,
window.opener.unsubscribeFromFolder(folderUrl, owner, refreshCallback,
refreshCallbackData);
}
else {
if (owner.startsWith('/'))
if (owner.charAt(0) == '/')
owner = owner.substring(1);
if (owner != UserLogin) {
var url = (ApplicationBaseURL + folder + "/unsubscribe");
var url = folderUrl + "/unsubscribe";
removeFolderRequestCount++;
var rfCbData = { method: refreshCallback, data: refreshCallbackData };
triggerAjaxRequest(url, folderUnsubscriptionCallback, rfCbData);