From 8ed772ebd79bbd35e24683084aaec0ddb946dd91 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 8 Oct 2010 20:20:17 +0000 Subject: [PATCH 1/2] Monotone-Parent: 5676ae3c13c58684d5b39a82a4ce2aeafdfc7040 Monotone-Revision: bcd5c0bb7596efb5593c7dea3526583367b84860 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-10-08T20:20:17 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/ContactsUI.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index b61a332ac..c1533ae9f 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -1021,8 +1021,7 @@ function onMenuSharing(event) { var selected = folders.getSelectedNodes()[0]; var owner = selected.getAttribute("owner"); if (owner == "nobody") - showAlertDialog(clabels["The user rights cannot be" - + " edited for this object!"]); + showAlertDialog(_("The user rights cannot be edited for this object!")); else { var title = this.innerHTML; var url = URLForFolderID(selected.getAttribute("id")); From ba63f4deab241c8e311007d4ab1e680e0959aa4f Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 8 Oct 2010 20:25:54 +0000 Subject: [PATCH 2/2] See Changelog. Monotone-Parent: bcd5c0bb7596efb5593c7dea3526583367b84860 Monotone-Revision: 8edef594b9dbe81854edb93b0440fb81ef74970f Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-10-08T20:25:54 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/WebServerResources/generic.js | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8008c355b..3116d208b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-10-08 Francis Lachapelle + * UI/WebServerResources/generic.js (showConfirmDialog) + (showPromptDialog): keys for cached dialogs are now build from a + combination of the dialog title and label to avoid collisions. + * UI/WebServerResources/SchedulerUI.js (deleteEventFromViewCancel): new function loaded if the user cancel the deletion of an event. It clears the array of events to diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index b6bd87978..c676b3031 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1822,7 +1822,7 @@ function _showAlertDialog(label) { } function showConfirmDialog(title, label, callbackYes, callbackNo) { - var dialog = dialogs[label]; + var dialog = dialogs[title+label]; if (dialog) { $("bgDialogDiv").show(); } @@ -1836,13 +1836,13 @@ function showConfirmDialog(title, label, callbackYes, callbackNo) { fields, "none"); document.body.appendChild(dialog); - dialogs[label] = dialog; + dialogs[title+label] = dialog; } dialog.show(); } function showPromptDialog(title, label, callback, defaultValue) { - var dialog = dialogs[label]; + var dialog = dialogs[title+label]; v = defaultValue?defaultValue:""; if (dialog) { $("bgDialogDiv").show(); @@ -1867,7 +1867,7 @@ function showPromptDialog(title, label, callback, defaultValue) { fields, "none"); document.body.appendChild(dialog); - dialogs[label] = dialog; + dialogs[title+label] = dialog; } dialog.show(); dialog.down("input").focus();