From 8428eb274778d76b0b3ea90072b8cd10bf70ed18 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 5 Jan 2011 19:04:15 +0000 Subject: [PATCH] See Changelog Monotone-Parent: 57eac757f7d831fe529b14ff7416da35dd2eeff0 Monotone-Revision: 87cdbdef6d83dbc434c03ced31452112ebb2df51 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-01-05T19:04:15 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/WebServerResources/generic.js | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8da14bc8c..157a4baec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-01-05 Francis Lachapelle + + * UI/WebServerResources/generic.js (showConfirmDialog): buttons + callbacks must be updated when retrieving dialog box from cache. + 2010-12-30 Wolfgang Sourdeau * OpenChange/MAPIStoreMailMessageTable.m diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index cdfb5fc9d..2e4e4df9e 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1798,7 +1798,7 @@ function createButton(id, caption, action) { span.appendChild(document.createTextNode(caption)); } if (action) - newButton.observe("click", action); + newButton.on("click", action); return newButton; } @@ -1838,6 +1838,13 @@ function showConfirmDialog(title, label, callbackYes, callbackNo) { var dialog = dialogs[title+label]; if (dialog) { $("bgDialogDiv").show(); + + // Update callbacks on buttons + var buttons = dialog.getElementsByTagName("a"); + buttons[0].stopObserving(); + buttons[0].on("click", callbackYes); + buttons[1].stopObserving(); + buttons[1].on("click", callbackNo || disposeDialog); } else { var fields = createElement("p");