amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-12 23:37:15 +00:00
Code Issues Projects Releases Wiki Activity

merge of '7766ae8ec61d9568e049bfa9fb16f7452250a88a'

Browse Source 
and 'fa4c79494b368a1d150b33a70179a532c2f71dcd'

Monotone-Parent: 7766ae8ec61d9568e049bfa9fb16f7452250a88a
Monotone-Parent: fa4c79494b368a1d150b33a70179a532c2f71dcd
Monotone-Revision: 069a26b1da4cd9cb430bcfa41dc9eb96e0cc8778

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-19T17:46:13
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2010-08-19 17:46:13 +00:00
2 parents 0862665e85 354fcbecaf
commit 048c15cf38
40 files changed
+688 -109
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/WebServerResources/UIxComponentEditor.js
+7 -4
View File
@@ -373,10 +373,13 @@ function onPopupReminderWindow(event) {
if (event) {
if (ComponentEditor.reminderWindow && ComponentEditor.reminderWindow.open && !ComponentEditor.reminderWindow.closed)
ComponentEditor.reminderWindow.focus();
else
ComponentEditor.reminderWindow = window.open(ApplicationBaseURL + "editReminder",
sanitizeWindowName(activeCalendar + activeComponent + "Reminder"),
"width=250,height=150");
else {
var height = (emailAlarmsEnabled ? 215 : 150);
ComponentEditor.reminderWindow
= window.open(ApplicationBaseURL + "editReminder",
sanitizeWindowName(activeCalendar + activeComponent + "Reminder"),
"width=255,height=" + height);
}
}
}
else if (reminderHref)
UI/WebServerResources/UIxReminderEditor.js
+43 -1
View File
@@ -6,7 +6,6 @@ function initializeWindowButtons() {
cancelButton.observe("click", onEditorCancelClick, false);
}
function initializeFormValues() {
if (parent$("reminderUnit").value.length > 0) {
$("quantityField").value = parent$("reminderQuantity").value;
@@ -14,6 +13,33 @@ function initializeFormValues() {
$("relationsList").value = parent$("reminderRelation").value;
$("referencesList").value = parent$("reminderReference").value;
}
var actionList = $("actionList");
if (actionList) {
actionList.observe("change", onActionListChange);
var action = parent$("reminderAction").value;
if (!action)
action = "display";
actionList.value = action;
if (action == "email") {
$("emailOrganizer").checked = (parent$("reminderEmailOrganizer").value
== "true");
$("emailAttendees").checked = (parent$("reminderEmailAttendees").value
== "true");
}
updateActionCheckboxes(actionList);
}
}
function onActionListChange() {
updateActionCheckboxes(this);
}
function updateActionCheckboxes(list) {
var disabled = (list.value != "email");
$("emailOrganizer").disabled = disabled;
$("emailAttendees").disabled = disabled;
}
function onEditorOkClick(event) {
@@ -24,6 +50,22 @@ function onEditorOkClick(event) {
parent$("reminderRelation").value = $("relationsList").value;
parent$("reminderReference").value = $("referencesList").value;
var actionList = $("actionList");
var action;
if (actionList) {
action = $("actionList").value;
parent$("reminderEmailOrganizer").value = ($("emailOrganizer").checked
? "true"
: "false");
parent$("reminderEmailAttendees").value = ($("emailAttendees").checked
? "true"
: "false");
}
else {
action = "display";
}
parent$("reminderAction").value = action;
window.close();
}
else