amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-17 04:25:56 +00:00
Code Issues Projects Releases Wiki Activity

merge of '7283e847d5338d046cd6d5bd9ea7475d0248528f'

Browse Source 
and '7be471a6a7e6a2c4d99f470e9617461175519459'

Monotone-Parent: 7283e847d5338d046cd6d5bd9ea7475d0248528f
Monotone-Parent: 7be471a6a7e6a2c4d99f470e9617461175519459
Monotone-Revision: 27e383633f4976ef792123d347e4195e8fecd185

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-08T20:31:47
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-10-08 20:31:47 +00:00
parent d28c57e9b5 118a5887ea
commit 9145f0be46
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2010-10-08 Francis Lachapelle <flachapelle@inverse.ca>
* 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

3
UI/WebServerResources/ContactsUI.js
View File

@@ -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"));

8
UI/WebServerResources/generic.js
View File

@@ -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();