From 5b678fd334a665293f1042f8fa5949e1750440e0 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 17 Dec 2007 15:34:01 +0000 Subject: [PATCH] Monotone-Parent: b18975047f69436053c859a6b62916e650ac6f8b Monotone-Revision: 558ad53328c167b68815d36374a3c2d92055f0b2 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-12-17T15:34:01 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/ContactsUI.js | 5 ++++- UI/WebServerResources/UIxContactsUserFolders.js | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index fa2ba949f..9c7bcf587 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -533,6 +533,7 @@ function onAddressBookNew(event) { function appendAddressBook(name, folder) { var owner; + var result = true; if (folder) { owner = getSubscribedFolderOwner(folder); @@ -545,7 +546,7 @@ function appendAddressBook(name, folder) { owner = UserLogin; if ($(folder)) - window.alert(clabels["You have already subscribed to that folder!"]); + result = false; else { var contactFolders = $("contactFolders"); var items = contactFolders.childNodesWithTag("li"); @@ -563,6 +564,8 @@ function appendAddressBook(name, folder) { li.appendChild(document.createTextNode(name)); setEventsOnContactFolder(li); } + + return result; } function newFolderCallback(http) { diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js index fe55efc34..7ad090869 100644 --- a/UI/WebServerResources/UIxContactsUserFolders.js +++ b/UI/WebServerResources/UIxContactsUserFolders.js @@ -133,7 +133,8 @@ function onConfirmFolderSelection(event) { folderName = spans1[0].innerHTML + ' (' + email + ')'; } 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!"]); } }