Monotone-Parent: b18975047f69436053c859a6b62916e650ac6f8b
Monotone-Revision: 558ad53328c167b68815d36374a3c2d92055f0b2 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-12-17T15:34:01 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
619ca36d1e
commit
5b678fd334
|
@ -533,6 +533,7 @@ function onAddressBookNew(event) {
|
||||||
|
|
||||||
function appendAddressBook(name, folder) {
|
function appendAddressBook(name, folder) {
|
||||||
var owner;
|
var owner;
|
||||||
|
var result = true;
|
||||||
|
|
||||||
if (folder) {
|
if (folder) {
|
||||||
owner = getSubscribedFolderOwner(folder);
|
owner = getSubscribedFolderOwner(folder);
|
||||||
|
@ -545,7 +546,7 @@ function appendAddressBook(name, folder) {
|
||||||
owner = UserLogin;
|
owner = UserLogin;
|
||||||
|
|
||||||
if ($(folder))
|
if ($(folder))
|
||||||
window.alert(clabels["You have already subscribed to that folder!"]);
|
result = false;
|
||||||
else {
|
else {
|
||||||
var contactFolders = $("contactFolders");
|
var contactFolders = $("contactFolders");
|
||||||
var items = contactFolders.childNodesWithTag("li");
|
var items = contactFolders.childNodesWithTag("li");
|
||||||
|
@ -563,6 +564,8 @@ function appendAddressBook(name, folder) {
|
||||||
li.appendChild(document.createTextNode(name));
|
li.appendChild(document.createTextNode(name));
|
||||||
setEventsOnContactFolder(li);
|
setEventsOnContactFolder(li);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
function newFolderCallback(http) {
|
function newFolderCallback(http) {
|
||||||
|
|
|
@ -133,7 +133,8 @@ function onConfirmFolderSelection(event) {
|
||||||
folderName = spans1[0].innerHTML + ' (' + email + ')';
|
folderName = spans1[0].innerHTML + ' (' + email + ')';
|
||||||
}
|
}
|
||||||
var data = { folderName: folderName, folder: folder, window: window };
|
var data = { folderName: folderName, folder: folder, window: window };
|
||||||
window.opener.subscribeToFolder(window.opener.userFolderCallback, data);
|
if (!window.opener.subscribeToFolder(window.opener.userFolderCallback, data))
|
||||||
|
window.alert(clabels["You have already subscribed to that folder!"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue