From 8acfafe4ea55ad501d3f5799bcb74ea8ec0c8e96 Mon Sep 17 00:00:00 2001 From: "pavlov%pavlov.net" Date: Wed, 1 Jun 2005 19:28:05 +0000 Subject: [PATCH] hooking up attendess in to the event dialog git-svn-id: svn://10.0.0.236/trunk@173966 18797224-902f-48f8-a5cc-f745e15eee43 --- .../base/content/calendar-event-dialog.js | 43 +++++++++++++++---- .../base/content/calendar-event-dialog.xul | 11 +++-- .../content/calendar-recurrence-dialog.xul | 2 +- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/mozilla/calendar/base/content/calendar-event-dialog.js b/mozilla/calendar/base/content/calendar-event-dialog.js index 81011922d7e..ddb68906a2d 100644 --- a/mozilla/calendar/base/content/calendar-event-dialog.js +++ b/mozilla/calendar/base/content/calendar-event-dialog.js @@ -110,6 +110,15 @@ function loadDialog() setElementValue("event-url", event.getProperty("URL")); setElementValue("event-description", event.getProperty("DESCRIPTION")); + /* attendence */ + var attendeeString = ""; + for each (var attendee in event.getAttendees({})) { + if (attendeeString != "") + attendeeString += ","; + attendeeString += attendee.id.split("mailto:")[1]; + } + setElementValue("event-attendees", attendeeString); + /* event default calendar */ if (event.parent) { var calendarList = document.getElementById("event-calendar"); @@ -120,10 +129,12 @@ function loadDialog() } } + /* recurrence */ if (event.recurrenceInfo) { setElementValue("event-recurrence", "true", "checked"); } + /* alarms */ if (event.hasAlarm) { var alarmLength = event.getProperty("alarmLength"); if (alarmLength != null) { @@ -146,6 +157,29 @@ function saveDialog(event) setEventProperty(event, "URL", getElementValue("event-url")); setEventProperty(event, "DESCRIPTION", getElementValue("event-description")); + /* attendence */ + event.removeAllAttendees(); + var attendees = getElementValue("event-attendees"); + if (attendees != "") { + for each (var addr in attendees.split(",")) { + var attendee = createAttendee(); + attendee.id = "mailto:" + addr; + event.addAttendee(attendee); + } + } + + /* recurrence */ + if (getElementValue("event-recurrence", "checked")) { + if (window.recurrenceInfo) { + dump("setting recurrenceInfo!\n"); + event.recurrenceInfo = window.recurrenceInfo; + } else + dump("not setting recurrenceInfo\n"); + } else { + event.recurrenceInfo = null; + } + + /* alarms */ event.hasAlarm = (getElementValue("event-alarm") != "none"); if (!event.hasAlarm) { event.deleteProperty("alarmLength"); @@ -186,15 +220,6 @@ function saveDialog(event) event.alarmTime = alarmTime; } - if (getElementValue("event-recurrence", "checked")) { - if (window.recurrenceInfo) { - dump("setting recurrenceInfo!\n"); - event.recurrenceInfo = window.recurrenceInfo; - } else - dump("not setting recurrenceInfo\n"); - } else { - event.recurrenceInfo = null; - } } diff --git a/mozilla/calendar/base/content/calendar-event-dialog.xul b/mozilla/calendar/base/content/calendar-event-dialog.xul index 0a12e0bb56e..0e2d3da7f85 100644 --- a/mozilla/calendar/base/content/calendar-event-dialog.xul +++ b/mozilla/calendar/base/content/calendar-event-dialog.xul @@ -72,16 +72,21 @@ + + + diff --git a/mozilla/calendar/base/content/calendar-recurrence-dialog.xul b/mozilla/calendar/base/content/calendar-recurrence-dialog.xul index d85f2b0621e..f05a3370996 100644 --- a/mozilla/calendar/base/content/calendar-recurrence-dialog.xul +++ b/mozilla/calendar/base/content/calendar-recurrence-dialog.xul @@ -45,7 +45,7 @@