diff -u8pdNr 0.9/chrome/content/ccd-calendar-item-editing.js 1.0/chrome/content/ccd-calendar-item-editing.js --- 0.9/chrome/content/ccd-calendar-item-editing.js 2011-11-21 20:20:44 +0000 +++ 1.0/chrome/content/ccd-calendar-item-editing.js 1970-01-01 00:00:00 +0000 @@ -1,614 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Oracle Corporation code. - * - * The Initial Developer of the Original Code is Oracle Corporation - * Portions created by the Initial Developer are Copyright (C) 2005 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Stuart Parmenter - * Robin Edrenius - * Philipp Kewisch - * Daniel Boelzle - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -Components.utils.import("resource://calendar/modules/calAlarmUtils.jsm"); - -function setCustomCalendarDefaults(aItem) { - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - var prefBranch = prefService.getBranch("extensions.customcalendardefaults."); - let type = cal.isEvent(aItem) ? "event" : "todo"; - if (type == "event") { - // apply default event status - let ccdStatus = prefBranch.getCharPref("event.status"); - aItem.setProperty("STATUS", ccdStatus); - // apply default event privacy - let ccdPrivacy = prefBranch.getBoolPref("event.privacy"); - if (ccdPrivacy == true) { - let ccdPrivacyState = prefBranch.getCharPref("event.privacy.state"); - aItem.setProperty("CLASS", ccdPrivacyState); - } - // apply default event priority - let ccdPriority = prefBranch.getCharPref("event.priority"); - aItem.setProperty("PRIORITY", ccdPriority); - // apply default event showTimeAs - let ccdShowTimeAs = prefBranch.getBoolPref("event.showTimeAs"); - if (ccdShowTimeAs == true) { - let ccdShowTimeAsState = prefBranch.getCharPref("event.showTimeAs.state"); - aItem.setProperty("TRANSP", ccdShowTimeAsState); - } - } - else if (type == "todo") { - // apply default task status - let ccdStatus = prefBranch.getCharPref("task.status"); - aItem.setProperty("STATUS", ccdStatus); - // apply default task privacy - let ccdPrivacy = prefBranch.getBoolPref("task.privacy"); - if (ccdPrivacy == true) { - let ccdPrivacyState = prefBranch.getCharPref("task.privacy.state"); - aItem.setProperty("CLASS", ccdPrivacyState); - } - // apply default task priority - let ccdPriority = prefBranch.getCharPref("task.priority"); - aItem.setProperty("PRIORITY", ccdPriority); - // apply default task showTimeAs - let ccdShowTimeAs = prefBranch.getBoolPref("task.showTimeAs"); - if (ccdShowTimeAs == true) { - let ccdShowTimeAsState = prefBranch.getCharPref("task.showTimeAs.state"); - aItem.setProperty("TRANSP", ccdShowTimeAsState); - } - } -} - -/** - * Takes a job and makes sure the dispose function on it is called. If there is - * no dispose function or the job is null, ignore it. - * - * @param job The job to dispose. - */ -function disposeJob(job) { - if (job && job.dispose) { - job.dispose(); - } -} - -/** - * Creates an event with the calendar event dialog. - * - * @param calendar (optional) The calendar to create the event in - * @param startDate (optional) The event's start date. - * @param endDate (optional) The event's end date. - * @param summary (optional) The event's title. - * @param event (optional) A template event to show in the dialog - * @param aForceAllDay (optional) Make sure the event shown in the dialog is an - * allday event. - */ -function createEventWithDialog(calendar, startDate, endDate, summary, event, aForceAllday) { - const kDefaultTimezone = calendarDefaultTimezone(); - - var onNewEvent = function(item, calendar, originalItem, listener) { - if (item.id) { - // If the item already has an id, then this is the result of - // saving the item without closing, and then saving again. - doTransaction('modify', item, calendar, originalItem, listener); - } else { - // Otherwise, this is an addition - doTransaction('add', item, calendar, null, listener); - } - }; - - if (event) { - if (!event.isMutable) { - event = event.clone(); - } - // If the event should be created from a template, then make sure to - // remove the id so that the item obtains a new id when doing the - // transaction - event.id = null; - - if (aForceAllday) { - event.startDate.isDate = true; - event.endDate.isDate = true; - if (event.startDate.compare(event.endDate) == 0) { - // For a one day all day event, the end date must be 00:00:00 of - // the next day. - event.endDate.day++; - } - } - - if (!event.calendar) { - event.calendar = calendar || getSelectedCalendar(); - } - } else { - event = createEvent(); - - if (startDate) { - event.startDate = startDate.clone(); - if (startDate.isDate && !aForceAllday) { - // This is a special case where the date is specified, but the - // time is not. To take care, we setup up the time to our - // default event start time. - event.startDate = getDefaultStartDate(event.startDate); - } else if (aForceAllday) { - // If the event should be forced to be allday, then don't set up - // any default hours and directly make it allday. - event.startDate.isDate = true; - event.startDate.timezone = floating(); - } - } else { - // If no start date was passed, then default to the next full hour - // of today, but with the date of the selected day - var refDate = currentView().initialized && currentView().selectedDay.clone(); - event.startDate = getDefaultStartDate(refDate); - } - - if (endDate) { - event.endDate = endDate.clone(); - if (aForceAllday) { - // XXX it is currently not specified, how callers that force all - // day should pass the end date. Right now, they should make - // sure that the end date is 00:00:00 of the day after. - event.endDate.isDate = true; - event.endDate.timezone = floating(); - } - } else { - event.endDate = event.startDate.clone(); - if (!aForceAllday) { - // If the event is not all day, then add the default event - // length. - event.endDate.minute += getPrefSafe("calendar.event.defaultlength", 60); - } else { - // All day events need to go to the beginning of the next day. - event.endDate.day++; - } - } - - event.calendar = calendar || getSelectedCalendar(); - - if (summary) { - event.title = summary; - } - - cal.alarms.setDefaultValues(event); - setCustomCalendarDefaults(event); - } - openEventDialog(event, calendar, "new", onNewEvent, null); -} - -/** - * Creates a task with the calendar event dialog. - * - * @param calendar (optional) The calendar to create the task in - * @param dueDate (optional) The task's due date. - * @param summary (optional) The task's title. - * @param todo (optional) A template task to show in the dialog. - * @param initialDate (optional) The initial date for new task datepickers - */ -function createTodoWithDialog(calendar, dueDate, summary, todo, initialDate) { - const kDefaultTimezone = calendarDefaultTimezone(); - - var onNewItem = function(item, calendar, originalItem, listener) { - if (item.id) { - // If the item already has an id, then this is the result of - // saving the item without closing, and then saving again. - doTransaction('modify', item, calendar, originalItem, listener); - } else { - // Otherwise, this is an addition - doTransaction('add', item, calendar, null, listener); - } - } - - if (todo) { - // If the todo should be created from a template, then make sure to - // remove the id so that the item obtains a new id when doing the - // transaction - if (todo.id) { - todo = todo.clone(); - todo.id = null; - } - - if (!todo.calendar) { - todo.calendar = calendar || getSelectedCalendar(); - } - } else { - todo = createTodo(); - todo.calendar = calendar || getSelectedCalendar(); - - if (summary) - todo.title = summary; - - if (dueDate) - todo.dueDate = dueDate; - - if (cal.getPrefSafe("calendar.alarms.onfortodos", 0) == 1 && - !todo.entryDate) { - // the todo must have an entry date if we want to set an alarm - todo.entryDate = initialDate; - } - - cal.alarms.setDefaultValues(todo); - setCustomCalendarDefaults(todo); - } - - openEventDialog(todo, calendar, "new", onNewItem, null, initialDate); -} - - - -/** - * Modifies the passed event in the event dialog. - * - * @param aItem The item to modify. - * @param job (optional) The job object that controls this - * modification. - * @param aPromptOccurrence If the user should be prompted to select if the - * parent item or occurrence should be modified. - * @param initialDate (optional) The initial date for new task datepickers - */ -function modifyEventWithDialog(aItem, job, aPromptOccurrence, initialDate) { - let dlg = cal.findItemWindow(aItem); - if (dlg) { - dlg.focus(); - disposeJob(job); - return; - } - - let onModifyItem = function(item, calendar, originalItem, listener) { - doTransaction('modify', item, calendar, originalItem, listener); - }; - - let item = aItem; - let futureItem, response; - if (aPromptOccurrence !== false) { - [item, futureItem, response] = promptOccurrenceModification(aItem, true, "edit"); - } - - if (item && (response || response === undefined)) { - openEventDialog(item, item.calendar, "modify", onModifyItem, job, initialDate); - } else { - disposeJob(job); - } -} - -/** - * Opens the event dialog with the given item (task OR event) - * - * @param calendarItem The item to open the dialog with - * @param calendar The calendar to open the dialog with. - * @param mode The operation the dialog should do ("new", "modify") - * @param callback The callback to call when the dialog has completed. - * @param job (optional) The job object for the modification. - * @param initialDate (optional) The initial date for new task datepickers - */ -function openEventDialog(calendarItem, calendar, mode, callback, job, initialDate) { - let dlg = cal.findItemWindow(calendarItem); - if (dlg) { - dlg.focus(); - disposeJob(job); - return; - } - - // Set up some defaults - mode = mode || "new"; - calendar = calendar || getSelectedCalendar(); - var calendars = getCalendarManager().getCalendars({}); - calendars = calendars.filter(isCalendarWritable); - - var isItemSupported; - if (isToDo(calendarItem)) { - isItemSupported = function isTodoSupported(aCalendar) { - return (aCalendar.getProperty("capabilities.tasks.supported") !== false); - }; - } else if (isEvent(calendarItem)) { - isItemSupported = function isEventSupported(aCalendar) { - return (aCalendar.getProperty("capabilities.events.supported") !== false); - }; - } - - // Filter out calendars that don't support the given calendar item - calendars = calendars.filter(isItemSupported); - - if (mode == "new" && calendars.length < 1 && - (!isCalendarWritable(calendar) || !isItemSupported(calendar))) { - // There are no writable calendars or no calendar supports the given - // item. Don't show the dialog. - disposeJob(job); - return; - } else if (mode == "new" && - (!isCalendarWritable(calendar) || !isItemSupported(calendar))) { - // Pick the first calendar that supports the item and is writable - calendar = calendars[0]; - if (calendarItem) { - // XXX The dialog currently uses the items calendar as a first - // choice. Since we are shortly before a release to keep regression - // risk low, explicitly set the item's calendar here. - calendarItem.calendar = calendars[0]; - } - } - - // Setup the window arguments - var args = new Object(); - args.calendarEvent = calendarItem; - args.calendar = calendar; - args.mode = mode; - args.onOk = callback; - args.job = job; - args.initialStartDateValue = (initialDate || getDefaultStartDate()); - - // this will be called if file->new has been selected from within the dialog - args.onNewEvent = function(calendar) { - createEventWithDialog(calendar, null, null); - }; - args.onNewTodo = function(calendar) { - createTodoWithDialog(calendar); - }; - - // the dialog will reset this to auto when it is done loading. - window.setCursor("wait"); - - // ask the provide if this item is an invitation. if this is the case - // we'll open the summary dialog since the user is not allowed to change - // the details of the item. - var isInvitation = false; - if (calInstanceOf(calendar, Components.interfaces.calISchedulingSupport)) { - isInvitation = calendar.isInvitation(calendarItem); - } - - // open the dialog modeless - var url = "chrome://calendar/content/calendar-event-dialog.xul"; - if ((mode != "new" && isInvitation) || !isCalendarWritable(calendar)) { - url = "chrome://calendar/content/calendar-summary-dialog.xul"; - } - openDialog(url, "_blank", "chrome,titlebar,resizable", args); -} - -/** - * Prompts the user how the passed item should be modified. If the item is an - * exception or already a parent item, the item is returned without prompting. - * If "all occurrences" is specified, the parent item is returned. If "this - * occurrence only" is specified, then aItem is returned. If "this and following - * occurrences" is selected, aItem's parentItem is modified so that the - * recurrence rules end (UNTIL) just before the given occurrence. If - * aNeedsFuture is specified, a new item is made from the part that was stripped - * off the passed item. - * - * EXDATEs and RDATEs that do not fit into the items recurrence are removed. If - * the modified item or the future item only consist of a single occurrence, - * they are changed to be single items. - * - * @param aItem The item to check. - * @param aNeedsFuture If true, the future item is parsed. - * This parameter can for example be - * false if a deletion is being made. - * @param aAction Either "edit" or "delete". Sets up - * the labels in the occurrence prompt - * @return [modifiedItem, futureItem, promptResponse] - * If "this and all following" was chosen, - * an array containing the item *until* - * the given occurrence (modifiedItem), - * and the item *after* the given - * occurrence (futureItem). - * - * If any other option was chosen, - * futureItem is null and the - * modifiedItem is either the parent item - * or the passed occurrence, or null if - * the dialog was canceled. - * - * The promptResponse parameter gives the - * response of the dialog as a constant. - */ -function promptOccurrenceModification(aItem, aNeedsFuture, aAction) { - const CANCEL = 0; - const MODIFY_OCCURRENCE = 1; - const MODIFY_FOLLOWING = 2; - const MODIFY_PARENT = 3; - - var futureItem = false; - var pastItem; - var type = CANCEL; - - // Check if this actually is an instance of a recurring event - if (aItem == aItem.parentItem) { - type = MODIFY_PARENT; - } else if (aItem.parentItem.recurrenceInfo.getExceptionFor(aItem.recurrenceId)) { - // If the user wants to edit an occurrence which is already an exception - // always edit this single item. - // XXX Why? I think its ok to ask also for exceptions. - type = MODIFY_OCCURRENCE; - } else { - // Prompt the user. Setting modal blocks the dialog until it is closed. We - // use rv to pass our return value. - var rv = { value: CANCEL, item: aItem, action: aAction}; - window.openDialog("chrome://calendar/content/calendar-occurrence-prompt.xul", - "PromptOccurrenceModification", - "centerscreen,chrome,modal,titlebar", - rv); - type = rv.value; - } - - switch (type) { - case MODIFY_PARENT: - pastItem = aItem.parentItem; - break; - case MODIFY_FOLLOWING: - // TODO tbd in a different bug - throw Components.results.NS_ERROR_NOT_IMPLEMENTED; - break; - case MODIFY_OCCURRENCE: - pastItem = aItem; - break; - case CANCEL: - // Since we have not set past or futureItem, the return below will - // take care. - break; - } - - return [pastItem, futureItem, type]; -} - -// Undo/Redo code - -/** - * Helper to return the transaction manager service. - * - * @return The calITransactionManager service. - */ -function getTransactionMgr() { - return Components.classes["@mozilla.org/calendar/transactionmanager;1"] - .getService(Components.interfaces.calITransactionManager); -} - - -/** - * Create and commit a transaction with the given arguments to the transaction - * manager. Also updates the undo/redo menu. - * - * @see calITransactionManager - * @param aAction The action to do. - * @param aItem The new item to add/modify/delete - * @param aCalendar The calendar to do the transaction on - * @param aOldItem (optional) some actions require an old item - * @param aListener (optional) the listener to call when complete. - */ -function doTransaction(aAction, aItem, aCalendar, aOldItem, aListener) { - // This is usually a user-initiated transaction, so make sure the calendar - // this transaction is happening on is visible. - ensureCalendarVisible(aCalendar); - - // Now use the transaction manager to execute the action - getTransactionMgr().createAndCommitTxn(aAction, - aItem, - aCalendar, - aOldItem, - aListener ? aListener : null); - updateUndoRedoMenu(); -} - -/** - * Undo the last operation done through the transaction manager. - */ -function undo() { - if (canUndo()) { - getTransactionMgr().undo(); - updateUndoRedoMenu(); - } -} - -/** - * Redo the last undone operation in the transaction manager. - */ -function redo() { - if (canRedo()) { - getTransactionMgr().redo(); - updateUndoRedoMenu(); - } -} - -/** - * Start a batch transaction on the transaction manager. Can be called multiple - * times, which nests transactions. - */ -function startBatchTransaction() { - getTransactionMgr().beginBatch(); -} - -/** - * End a previously started batch transaction. NOTE: be sure to call this in a - * try-catch-finally-block in case you have code that could fail between - * startBatchTransaction and this call. - */ -function endBatchTransaction() { - getTransactionMgr().endBatch(); - updateUndoRedoMenu(); -} - -/** - * Checks if the last operation can be undone (or if there is a last operation - * at all). - */ -function canUndo() { - return getTransactionMgr().canUndo(); -} - -/** - * Checks if the last undone operation can be redone. - */ -function canRedo() { - return getTransactionMgr().canRedo(); -} - -/** - * Update the undo and redo commands. - */ -function updateUndoRedoMenu() { - goUpdateCommand("cmd_undo"); - goUpdateCommand("cmd_redo"); -} - -function setContextPartstat(value, scope, items) { - startBatchTransaction(); - try { - for each (let oldItem in items) { - if (scope == "all-occurrences") { - oldItem = oldItem.parentItem; - } - let attendee = null; - if (cal.isInvitation(oldItem)) { - // Check for the invited attendee first, this is more important - attendee = cal.getInvitedAttendee(oldItem); - } else if (oldItem.organizer && oldItem.getAttendees({}).length) { - // Now check the organizer. This should be done last. - let calOrgId = oldItem.calendar.getProperty("organizerId"); - if (calOrgId == oldItem.organizer.id) { - attendee = oldItem.organizer; - } - } - - if (attendee) { - let newItem = oldItem.clone(); - let newAttendee = attendee.clone(); - - newAttendee.participationStatus = value; - if (newAttendee.isOrganizer) { - newItem.organizer = newAttendee; - } else { - newItem.removeAttendee(attendee); - newItem.addAttendee(newAttendee); - } - - doTransaction('modify', newItem, newItem.calendar, oldItem, null); - } - } - } catch (e) { - cal.ERROR("Error setting partstat: " + e); - } finally { - endBatchTransaction(); - } -} diff -u8pdNr 0.9/chrome/content/ccd-calendar-task-editing.js 1.0/chrome/content/ccd-calendar-task-editing.js --- 0.9/chrome/content/ccd-calendar-task-editing.js 2011-11-21 20:24:22 +0000 +++ 1.0/chrome/content/ccd-calendar-task-editing.js 1970-01-01 00:00:00 +0000 @@ -1,309 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Sun Microsystems code. - * - * The Initial Developer of the Original Code is Sun Microsystems. - * Portions created by the Initial Developer are Copyright (C) 2007 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Michael Buettner - * Philipp Kewisch - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -Components.utils.import("resource://calendar/modules/calAlarmUtils.jsm"); - -function setCustomCalendarDefaults(item) { - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - var prefBranch = prefService.getBranch("extensions.customcalendardefaults."); - // apply default task status - let ccdStatus = prefBranch.getCharPref("task.status"); - item.setProperty("STATUS", ccdStatus); - // apply default task privacy - let ccdPrivacy = prefBranch.getBoolPref("task.privacy"); - if (ccdPrivacy == true) { - let ccdPrivacyState = prefBranch.getCharPref("task.privacy.state"); - item.setProperty("CLASS", ccdPrivacyState); - } - // apply default task priority - let ccdPriority = prefBranch.getCharPref("task.priority"); - item.setProperty("PRIORITY", ccdPriority); - // apply default task showTimeAs - let ccdShowTimeAs = prefBranch.getBoolPref("task.showTimeAs"); - if (ccdShowTimeAs == true) { - let ccdShowTimeAsState = prefBranch.getCharPref("task.showTimeAs.state"); - aItem.setProperty("TRANSP", ccdShowTimeAsState); - } -} - -/** - * Used by the "quick add" feature for tasks, for example in the task view or - * the uniinder-todo. - * - * NOTE: many of the following methods are called without taskEdit being the - * |this| object. - */ - -var taskEdit = { - /** - * Get the currently observed calendar. - */ - mObservedCalendar: null, - get observedCalendar() { - return this.mObservedCalendar; - }, - - /** - * Set the currently observed calendar, removing listeners to any old - * calendar set and adding listeners to the new one. - */ - set observedCalendar(v) { - if (this.mObservedCalendar) { - this.mObservedCalendar.removeObserver(this.calendarObserver); - } - - this.mObservedCalendar = v; - - if (this.mObservedCalendar) { - this.mObservedCalendar.addObserver(this.calendarObserver); - } - return this.mObservedCalendar; - }, - - /** - * Helper function to set readonly and aria-disabled states and the value - * for a given target. - * - * @param aTarget The ID or XUL node to set the value - * @param aDisable A boolean if the target should be disabled. - * @param aValue The value that should be set on the target. - */ - setupTaskField: function tE_setupTaskField(aTarget, aDisable, aValue) { - aTarget.value = aValue; - setElementValue(aTarget, aDisable && "true", "readonly"); - setElementValue(aTarget, aDisable && "true", "aria-disabled"); - }, - - /** - * Handler function to call when the quick-add textbox gains focus. - * - * @param aEvent The DOM focus event - */ - onFocus: function tE_onFocus(aEvent) { - var edit = aEvent.target; - if (edit.localName == "input") { - // For some reason, we only recieve an onfocus event for the textbox - // when debugging with venkman. - edit = edit.parentNode.parentNode; - } - - var calendar = getSelectedCalendar(); - edit.showsInstructions = true; - - if (calendar.getProperty("capabilities.tasks.supported") === false) { - taskEdit.setupTaskField(edit, - true, - calGetString("calendar", "taskEditInstructionsCapability")); - } else if (!isCalendarWritable(calendar)) { - taskEdit.setupTaskField(edit, - true, - calGetString("calendar", "taskEditInstructionsReadonly")); - } else { - edit.showsInstructions = false; - taskEdit.setupTaskField(edit, false, edit.savedValue || ""); - } - }, - - /** - * Handler function to call when the quick-add textbox loses focus. - * - * @param aEvent The DOM blur event - */ - onBlur: function tE_onBlur(aEvent) { - var edit = aEvent.target; - if (edit.localName == "input") { - // For some reason, we only recieve the blur event for the input - // element. There are no targets that point to the textbox. Go up - // the parent chain until we reach the textbox. - edit = edit.parentNode.parentNode; - } - - var calendar = getSelectedCalendar(); - - if (calendar.getProperty("capabilities.tasks.supported") === false){ - taskEdit.setupTaskField(edit, - true, - calGetString("calendar", "taskEditInstructionsCapability")); - } else if (!isCalendarWritable(calendar)) { - taskEdit.setupTaskField(edit, - true, - calGetString("calendar", "taskEditInstructionsReadonly")); - } else { - if (!edit.showsInstructions) { - edit.savedValue = edit.value || ""; - } - taskEdit.setupTaskField(edit, - false, - calGetString("calendar", "taskEditInstructions")); - } - edit.showsInstructions = true; - }, - - /** - * Handler function to call on keypress for the quick-add textbox. - * - * @param aEvent The DOM keypress event - */ - onKeyPress: function tE_onKeyPress(aEvent) { - if (aEvent.keyCode == Components.interfaces.nsIDOMKeyEvent.DOM_VK_RETURN) { - var edit = aEvent.target; - if (edit.value && edit.value.length > 0) { - var item = createTodo(); - item.calendar = getSelectedCalendar(); - item.title = edit.value; - edit.value = ""; - cal.alarms.setDefaultValues(item); - setCustomCalendarDefaults(item); - doTransaction('add', item, item.calendar, null, null); - } - } - }, - - /** - * Window load function to set up all quick-add textboxes. The texbox must - * have the class "task-edit-field". - */ - onLoad: function tE_onLoad(aEvent) { - window.removeEventListener("load", taskEdit.onLoad, false); - // TODO use getElementsByClassName - var taskEditFields = document.getElementsByAttribute("class", "task-edit-field"); - for (var i = 0; i < taskEditFields.length; i++) { - taskEdit.onBlur({ target: taskEditFields[i] }); - } - - getCompositeCalendar().addObserver(taskEdit.compositeObserver); - taskEdit.observedCalendar = getSelectedCalendar(); - }, - - /** - * Window load function to clean up all quick-add fields. - */ - onUnload: function tE_onUnload() { - getCompositeCalendar().removeObserver(taskEdit.compositeObserver); - taskEdit.observedCalendar = null; - }, - - /** - * Observer to watch for readonly, disabled and capability changes of the - * observed calendar. - * - * @see calIObserver - */ - calendarObserver: { - QueryInterface: function tE_calObs_QueryInterface(aIID) { - return doQueryInterface(this, null, aIID, - [Components.interfaces.calIObserver]); - }, - - // calIObserver: - onStartBatch: function() {}, - onEndBatch: function() {}, - onLoad: function(aCalendar) {}, - onAddItem: function(aItem) {}, - onModifyItem: function(aNewItem, aOldItem) {}, - onDeleteItem: function(aDeletedItem) {}, - onError: function(aCalendar, aErrNo, aMessage) {}, - - onPropertyChanged: function tE_calObs_onPropertyChanged(aCalendar, - aName, - aValue, - aOldValue) { - if (aCalendar.id != getSelectedCalendar().id) { - // Optimization: if the given calendar isn't the default calendar, - // then we don't need to change any readonly/disabled states. - return; - } - switch (aName) { - case "readOnly": - case "disabled": - var taskEditFields = document.getElementsByAttribute("class", "task-edit-field"); - for (var i = 0; i < taskEditFields.length; i++) { - taskEdit.onBlur({ target: taskEditFields[i] }); - } - } - }, - - onPropertyDeleting: function tE_calObs_onPropertyDeleting(aCalendar, - aName) { - // Since the old value is not used directly in onPropertyChanged, - // but should not be the same as the value, set it to a different - // value. - this.onPropertyChanged(aCalendar, aName, null, null); - } - }, - - /** - * Observer to watch for changes to the selected calendar. - * - * XXX I think we don't need to implement calIObserver here. - * - * @see calICompositeObserver - */ - compositeObserver: { - QueryInterface: function tE_compObs_QueryInterface(aIID) { - return doQueryInterface(this, null, aIID, - [Components.interfaces.calIObserver, - Components.interfaces.calICompositeObserver]); - }, - - // calIObserver: - onStartBatch: function() {}, - onEndBatch: function() {}, - onLoad: function(aCalendar) {}, - onAddItem: function(aItem) {}, - onModifyItem: function(aNewItem, aOldItem) {}, - onDeleteItem: function(aDeletedItem) {}, - onError: function(aCalendar, aErrNo, aMessage) {}, - onPropertyChanged: function(aCalendar, aName, aValue, aOldValue) {}, - onPropertyDeleting: function(aCalendar, aName) {}, - - // calICompositeObserver: - onCalendarAdded: function onCalendarAdded(aCalendar) {}, - onCalendarRemoved: function onCalendarRemoved(aCalendar) {}, - onDefaultCalendarChanged: function tE_compObs_onDefaultCalendarChanged(aNewDefault) { - var taskEditFields = document.getElementsByAttribute("class", "task-edit-field"); - for (var i = 0; i < taskEditFields.length; i++) { - taskEdit.onBlur({ target: taskEditFields[i] }); - } - taskEdit.observedCalendar = aNewDefault; - } - } -}; - -window.addEventListener("load", taskEdit.onLoad, false); -window.addEventListener("unload", taskEdit.onUnload, false); diff -u8pdNr 0.9/chrome/content/ccd-calendar-views.js 1.0/chrome/content/ccd-calendar-views.js --- 0.9/chrome/content/ccd-calendar-views.js 2011-11-21 20:25:10 +0000 +++ 1.0/chrome/content/ccd-calendar-views.js 1970-01-01 00:00:00 +0000 @@ -1,866 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Calendar views code - * - * The Initial Developer of the Original Code is - * the Mozilla Calendar Squad - * Portions created by the Initial Developer are Copyright (C) 2006 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Vladimir Vukicevic - * Joey Minta - * Michael Buettner - * gekacheka@yahoo.com - * Matthew Willis - * Philipp Kewisch - * Martin Schroeder - * Berend Cornelius - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -Components.utils.import("resource://calendar/modules/calUtils.jsm"); -Components.utils.import("resource://calendar/modules/calAlarmUtils.jsm"); - -function setCustomCalendarDefaults(item) { - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - var prefBranch = prefService.getBranch("extensions.customcalendardefaults."); - // apply default event status - let ccdStatus = prefBranch.getCharPref("event.status"); - item.setProperty("STATUS", ccdStatus); - // apply default event privacy - let ccdPrivacy = prefBranch.getBoolPref("event.privacy"); - if (ccdPrivacy == true) { - let ccdPrivacyState = prefBranch.getCharPref("event.privacy.state"); - item.setProperty("CLASS", ccdPrivacyState); - } - // apply default event priority - let ccdPriority = prefBranch.getCharPref("event.priority"); - item.setProperty("PRIORITY", ccdPriority); - // apply default event showTimeAs - let ccdShowTimeAs = prefBranch.getBoolPref("event.showTimeAs"); - if (ccdShowTimeAs == true) { - let ccdShowTimeAsState = prefBranch.getCharPref("event.showTimeAs.state"); - aItem.setProperty("TRANSP", ccdShowTimeAsState); - } -} - -/** - * Controller for the views - * @see calIcalendarViewController - */ -var calendarViewController = { - QueryInterface: function(aIID) { - if (!aIID.equals(Components.interfaces.calICalendarViewController) && - !aIID.equals(Components.interfaces.nsISupports)) { - throw Components.results.NS_ERROR_NO_INTERFACE; - } - - return this; - }, - - /** - * Creates a new event - * @see calICalendarViewController - */ - createNewEvent: function (aCalendar, aStartTime, aEndTime, aForceAllday) { - aCalendar = aCalendar || getSelectedCalendar(); - - - // if we're given both times, skip the dialog - if (aStartTime && aEndTime && !aStartTime.isDate && !aEndTime.isDate) { - let item = cal.createEvent(); - item.startDate = aStartTime; - item.endDate = aEndTime; - item.title = calGetString("calendar", "newEvent"); - item.calendar = aCalendar; - cal.alarms.setDefaultValues(item); - setCustomCalendarDefaults(item); - doTransaction('add', item, aCalendar, null, null); - } else { - createEventWithDialog(aCalendar, aStartTime, null, null, null, aForceAllday); - } - }, - - pendingJobs: [], - - /** - * In order to initiate a modification for the occurrence passed as argument - * we create an object that records the necessary details and store it in an - * internal array ('pendingJobs'). this way we're in a position to terminate - * any pending modification if need should be. - * - * @param aOccurrence The occurrence to create the pending - * modification for. - */ - createPendingModification: function (aOccurrence) { - // finalize a (possibly) pending modification. this will notify - // an open dialog to save any outstanding modifications. - aOccurrence = this.finalizePendingModification(aOccurrence); - - // XXX TODO logic to ask for which occurrence to modify is currently in - // modifyEventWithDialog, since the type of transactions done depend on - // this. This in turn makes the aOccurrence here be potentially wrong, I - // haven't seen it used anywhere though. - var pendingModification = { - controller: this, - item: aOccurrence, - finalize: null, - dispose: function() { - var array = this.controller.pendingJobs; - for (var i=0; i-all is used instead. - * - * @param id The id of the node to set up. - * @param attr The view specific attribute to modify. - */ - function setupViewNode(id, attr) { - let node = document.getElementById(id); - if (node.hasAttribute(attr + "-" + aViewType)) { - node.setAttribute(attr, node.getAttribute(attr + "-" + aViewType)); - } else { - node.setAttribute(attr, node.getAttribute(attr + "-all")); - } - } - - // Set up the labels and accesskeys for the context menu - ["calendar-view-context-menu-next", - "calendar-view-context-menu-previous", - "calendar-go-menu-next", - "calendar-go-menu-previous"].forEach(function(x) { - setupViewNode(x, "label"); - setupViewNode(x, "accesskey") - }); - - // Set up the labels for the view navigation - ["previous-view-button", - "today-view-button", - "next-view-button"].forEach(function(x) setupViewNode(x, "tooltiptext")); - - try { - selectedDay = viewDeck.selectedPanel.selectedDay; - currentSelection = viewDeck.selectedPanel.getSelectedItems({}); - } catch (ex) { - // This dies if no view has even been chosen this session, but that's - // ok because we'll just use now() below. - } - - if (!selectedDay) { - selectedDay = now(); - } - - // Anyone wanting to plug in a view needs to follow this naming scheme - let view = document.getElementById(aViewType + "-view"); - viewDeck.selectedPanel = view; - - // Select the corresponding tab - let viewTabs = document.getElementById("view-tabs"); - viewTabs.selectedIndex = getViewDeck().selectedIndex; - - let compositeCal = getCompositeCalendar(); - if (view.displayCalendar != compositeCal) { - view.displayCalendar = compositeCal; - view.timezone = calendarDefaultTimezone(); - view.controller = calendarViewController; - } - - view.goToDay(selectedDay); - view.setSelectedItems(currentSelection.length, currentSelection); - - onCalendarViewResize(); -} - -/** - * Returns the calendar view deck XUL element. - * - * @return The view-deck element. - */ -function getViewDeck() { - return document.getElementById("view-deck"); -} - -/** - * Returns the currently selected calendar view. - * - * @return The selected calendar view - */ -function currentView() { - return getViewDeck().selectedPanel; -} - -/** - * Returns the selected day in the current view. - * - * @return The selected day - */ -function getSelectedDay() { - return currentView().selectedDay; -} - -var gMidnightTimer; - -/** - * Creates a timer that will fire after midnight. Pass in a function as - * aRefreshCallback that should be called at that time. - * - * XXX This function is not very usable, since there is only one midnight timer. - * Better would be a function that uses the observer service to notify at - * midnight. - * - * @param aRefreshCallback A callback to be called at midnight. - */ -function scheduleMidnightUpdate(aRefreshCallback) { - var jsNow = new Date(); - var tomorrow = new Date(jsNow.getFullYear(), jsNow.getMonth(), jsNow.getDate() + 1); - var msUntilTomorrow = tomorrow.getTime() - jsNow.getTime(); - - // Is an nsITimer/callback extreme overkill here? Yes, but it's necessary to - // workaround bug 291386. If we don't, we stand a decent chance of getting - // stuck in an infinite loop. - var udCallback = { - notify: function(timer) { - aRefreshCallback(); - } - }; - - if (!gMidnightTimer) { - // Observer for wake after sleep/hibernate/standby to create new timers and refresh UI - var wakeObserver = { - observe: function(aSubject, aTopic, aData) { - if (aTopic == "wake_notification") { - // postpone refresh for another couple of seconds to get netwerk ready: - if (this.mTimer) { - this.mTimer.cancel(); - } else { - this.mTimer = Components.classes["@mozilla.org/timer;1"] - .createInstance(Components.interfaces.nsITimer); - } - this.mTimer.initWithCallback(udCallback, 10 * 1000, - Components.interfaces.nsITimer.TYPE_ONE_SHOT); - } - } - }; - - // Add observer - var observerService = Components.classes["@mozilla.org/observer-service;1"] - .getService(Components.interfaces.nsIObserverService); - observerService.addObserver(wakeObserver, "wake_notification", false); - - // Remove observer on unload - window.addEventListener("unload", - function() { - observerService.removeObserver(wakeObserver, "wake_notification"); - }, false); - gMidnightTimer = Components.classes["@mozilla.org/timer;1"] - .createInstance(Components.interfaces.nsITimer); - } else { - gMidnightTimer.cancel(); - } - gMidnightTimer.initWithCallback(udCallback, msUntilTomorrow, gMidnightTimer.TYPE_ONE_SHOT); -} - -/** - * Retuns a cached copy of the view stylesheet. - * - * @return The view stylesheet object. - */ -function getViewStyleSheet() { - if (!getViewStyleSheet.sheet) { - const cssUri = "chrome://calendar/content/calendar-view-bindings.css"; - for each (let sheet in document.styleSheets) { - if (sheet.href == cssUri) { - getViewStyleSheet.sheet = sheet; - break; - } - } - } - return getViewStyleSheet.sheet; -} - -/** - * Updates the view stylesheet to contain rules that give all boxes with class - * .calendar-color-box and an attribute calendar-id="" the - * background color of the specified calendar. - * - * @param aCalendar The calendar to update the stylesheet for. - */ -function updateStyleSheetForViews(aCalendar) { - if (!updateStyleSheetForViews.ruleCache) { - updateStyleSheetForViews.ruleCache = {}; - } - let ruleCache = updateStyleSheetForViews.ruleCache; - - if (!(aCalendar.id in ruleCache)) { - // We haven't create a rule for this calendar yet, do so now. - let sheet = getViewStyleSheet(); - let ruleString = '.calendar-color-box[calendar-id="' + aCalendar.id + '"] {} '; - let ruleIndex = sheet.insertRule(ruleString, sheet.cssRules.length); - - ruleCache[aCalendar.id] = sheet.cssRules[ruleIndex]; - } - - let color = aCalendar.getProperty("color") || "#A8C2E1"; - ruleCache[aCalendar.id].style.backgroundColor = color; - ruleCache[aCalendar.id].style.color = cal.getContrastingTextColor(color); -} - -/** - * Category preferences observer. Used to update the stylesheets for category - * colors. - * - * Note we need to keep the categoryPrefBranch variable outside of - * initCategories since branch observers only live as long as the branch object - * is alive, and out of categoryManagement to avoid cyclic references. - */ -var categoryPrefBranch; -var categoryManagement = { - QueryInterface: function cM_QueryInterface(aIID) { - return cal.doQueryInterface(this, - categoryManagement.__proto__, - aIID, - [Components.interfaces.nsIObserver]); - }, - - initCategories: function cM_initCategories() { - let prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - categoryPrefBranch = prefService.getBranch("calendar.category.color.") - .QueryInterface(Components.interfaces.nsIPrefBranch2); - let categories = categoryPrefBranch.getChildList(""); - - // Fix illegally formatted category prefs. - for (let i in categories) { - let category = categories[i]; - if (category.search(/[^_0-9a-z-]/) != -1) { - let categoryFix = formatStringForCSSRule(category); - if (!categoryPrefBranch.prefHasUserValue(categoryFix)) { - let color = categoryPrefBranch.getCharPref(category); - categoryPrefBranch.setCharPref(categoryFix, color); - categoryPrefBranch.clearUserPref(category); // not usable - categories[i] = categoryFix; // replace illegal name - } else { - categories.splice(i, 1); // remove illegal name - } - } - } - - // Add color information to the stylesheets. - categories.forEach(categoryManagement.updateStyleSheetForCategory, - categoryManagement); - categoryPrefBranch.addObserver("", categoryManagement, false); - }, - - cleanupCategories: function cM_cleanupCategories() { - let prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - categoryPrefBranch = prefService.getBranch("calendar.category.color.") - .QueryInterface(Components.interfaces.nsIPrefBranch2); - categoryPrefBranch.removeObserver("", categoryManagement); - }, - - observe: function cM_observe(aSubject, aTopic, aPrefName) { - this.updateStyleSheetForCategory(aPrefName); - // TODO Currently, the only way to find out if categories are removed is - // to initially grab the calendar.categories.names preference and then - // observe changes to it. it would be better if we had hooks for this, - // so we could delete the rule from our style cache and also remove its - // color preference. - }, - - categoryStyleCache: {}, - - updateStyleSheetForCategory: function cM_updateStyleSheetForCategory(aCatName) { - if (!(aCatName in this.categoryStyleCache)) { - // We haven't created a rule for this category yet, do so now. - let sheet = getViewStyleSheet(); - let ruleString = '.category-color-box[categories~="' + aCatName + '"] {} '; - let ruleIndex = sheet.insertRule(ruleString, sheet.cssRules.length); - - this.categoryStyleCache[aCatName] = sheet.cssRules[ruleIndex]; - } - - let color = cal.getPrefSafe("calendar.category.color." + aCatName) || ""; - this.categoryStyleCache[aCatName].style.backgroundColor = color; - } -}; - -/** - * Handler function to set the selected day in the minimonth to the currently - * selected day in the current view. - * - * @param event The "dayselect" event emitted from the views. - * - */ -function observeViewDaySelect(event) { - var date = event.detail; - var jsDate = new Date(date.year, date.month, date.day); - - // for the month and multiweek view find the main month, - // which is the month with the most visible days in the view; - // note, that the main date is the first day of the main month - var jsMainDate; - if (!event.originalTarget.supportsDisjointDates) { - var mainDate = null; - var maxVisibleDays = 0; - var startDay = currentView().startDay; - var endDay = currentView().endDay; - var firstMonth = startDay.startOfMonth; - var lastMonth = endDay.startOfMonth; - for (var month = firstMonth.clone(); month.compare(lastMonth) <= 0; month.month += 1) { - var visibleDays = 0; - if (month.compare(firstMonth) == 0) { - visibleDays = startDay.endOfMonth.day - startDay.day + 1; - } else if (month.compare(lastMonth) == 0) { - visibleDays = endDay.day; - } else { - visibleDays = month.endOfMonth.day; - } - if (visibleDays > maxVisibleDays) { - mainDate = month.clone(); - maxVisibleDays = visibleDays; - } - } - jsMainDate = new Date(mainDate.year, mainDate.month, mainDate.day); - } - - getMinimonth().selectDate(jsDate, jsMainDate); - currentView().focus(); -} - -/** - * Provides a neutral way to get the minimonth, regardless of whether we're in - * Sunbird or Lightning. - * - * @return The XUL minimonth element. - */ -function getMinimonth() { - return document.getElementById("calMinimonth"); -} - -/** - * Update the view orientation based on the checked state of the command - */ -function toggleOrientation() { - var cmd = document.getElementById("calendar_toggle_orientation_command"); - var newValue = (cmd.getAttribute("checked") == "true" ? "false" : "true"); - cmd.setAttribute("checked", newValue); - - var deck = getViewDeck(); - for each (var view in deck.childNodes) { - view.rotated = (newValue == "true"); - } - - // orientation refreshes automatically -} - -/** - * Toggle the workdays only checkbox and refresh the current view - * - * XXX We shouldn't need to refresh the view just to toggle the workdays. This - * should happen automatically. - */ -function toggleWorkdaysOnly() { - var cmd = document.getElementById("calendar_toggle_workdays_only_command"); - var newValue = (cmd.getAttribute("checked") == "true" ? "false" : "true"); - cmd.setAttribute("checked", newValue); - - var deck = getViewDeck(); - for each (var view in deck.childNodes) { - view.workdaysOnly = (newValue == "true"); - } - - // Refresh the current view - currentView().goToDay(currentView().selectedDay); -} - -/** - * Toggle the tasks in view checkbox and refresh the current view - */ -function toggleTasksInView() { - var cmd = document.getElementById("calendar_toggle_tasks_in_view_command"); - var newValue = (cmd.getAttribute("checked") == "true" ? "false" : "true"); - cmd.setAttribute("checked", newValue); - - var deck = getViewDeck(); - for each (var view in deck.childNodes) { - view.tasksInView = (newValue == "true"); - } - - // Refresh the current view - currentView().goToDay(currentView().selectedDay); -} - -/** - * Toggle the show completed in view checkbox and refresh the current view - */ -function toggleShowCompletedInView() { - var cmd = document.getElementById("calendar_toggle_show_completed_in_view_command"); - var newValue = (cmd.getAttribute("checked") == "true" ? "false" : "true"); - cmd.setAttribute("checked", newValue); - - var deck = getViewDeck(); - for each (var view in deck.childNodes) { - view.showCompleted = (newValue == "true"); - } - - // Refresh the current view - currentView().goToDay(currentView().selectedDay); -} - -/** - * Provides a neutral way to go to the current day in the views and minimonth. - * - * @param aDate The date to go. - */ -function goToDate(aDate) { - getMinimonth().value = aDate.jsDate; - currentView().goToDay(aDate); -} - -/** - * Returns the calendar view that was selected before restart, or the current - * calendar view if it has already been set in this session - * - * @return The last calendar view. - */ -function getLastCalendarView() { - var deck = getViewDeck(); - if (deck.selectedIndex > -1) { - var viewNode = deck.childNodes[deck.selectedIndex]; - return viewNode.id.replace(/-view/, ""); - } - - // No deck item was selected beforehand, default to week view. - return "week"; -} - -/** - * Deletes items currently selected in the view and clears selection. - */ -function deleteSelectedEvents() { - var selectedItems = currentView().getSelectedItems({}); - calendarViewController.deleteOccurrences(selectedItems.length, - selectedItems, - false, - false); - // clear selection - currentView().setSelectedItems(0, [], true); -} - -/** - * Edit the items currently selected in the view with the event dialog. - */ -function editSelectedEvents() { - var selectedItems = currentView().getSelectedItems({}); - if (selectedItems && selectedItems.length >= 1) { - modifyEventWithDialog(selectedItems[0], null, true); - } -} - -/** - * Select all events from all calendars. Use with care. - */ -function selectAllEvents() { - var items = []; - var listener = { - onOperationComplete: function selectAll_ooc(aCalendar, aStatus, - aOperationType, aId, - aDetail) { - currentView().setSelectedItems(items.length, items, false); - }, - onGetResult: function selectAll_ogr(aCalendar, aStatus, aItemType, - aDetail, aCount, aItems) { - for each (var item in aItems) { - items.push(item); - } - } - }; - - var composite = getCompositeCalendar(); - var filter = composite.ITEM_FILTER_CLASS_OCCURRENCES; - - if (currentView().tasksInView) { - filter |= composite.ITEM_FILTER_TYPE_ALL; - } else { - filter |= composite.ITEM_FILTER_TYPE_EVENT; - } - if (currentView().showCompleted) { - filter |= composite.ITEM_FILTER_COMPLETED_ALL; - } else { - filter |= composite.ITEM_FILTER_COMPLETED_NO; - } - - // Need to move one day out to get all events - var end = currentView().endDay.clone(); - end.day += 1; - - composite.getItems(filter, 0, currentView().startDay, end, listener); -} - -let cal = cal || {}; -cal.navigationBar = { - setDateRange: function setDateRange(aStartDate, aEndDate) { - let docTitle = ""; - if (aStartDate) { - let intervalLabel = document.getElementById("intervalDescription"); - let firstWeekNo = getWeekInfoService().getWeekTitle(aStartDate); - let secondWeekNo = firstWeekNo; - let weekLabel = document.getElementById("calendarWeek"); - if (aStartDate.nativeTime == aEndDate.nativeTime) { - intervalLabel.value = getDateFormatter().formatDate(aStartDate); - } else { - intervalLabel.value = currentView().getRangeDescription(); - secondWeekNo = getWeekInfoService().getWeekTitle(aEndDate); - } - if (secondWeekNo == firstWeekNo) { - weekLabel.value = calGetString("calendar", "singleShortCalendarWeek", [firstWeekNo]); - weekLabel.tooltipText = calGetString("calendar", "singleLongCalendarWeek", [firstWeekNo]); - } else { - weekLabel.value = calGetString("calendar", "severalShortCalendarWeeks", [firstWeekNo, secondWeekNo]); - weekLabel.tooltipText = calGetString("calendar", "severalLongCalendarWeeks", [firstWeekNo, secondWeekNo]); - } - docTitle = intervalLabel.value; - } - if (document.getElementById("modeBroadcaster").getAttribute("mode") == "calendar") { - document.title = (docTitle ? docTitle + " - " : "") + - calGetString("brand", "brandFullName", null, "branding"); - } - let viewTabs = document.getElementById("view-tabs"); - viewTabs.selectedIndex = getViewDeck().selectedIndex; - } -}; diff -u8pdNr 0.9/chrome/content/ccd-overlay.xul 1.0/chrome/content/ccd-overlay.xul --- 0.9/chrome/content/ccd-overlay.xul 1970-01-01 00:00:00 +0000 +++ 1.0/chrome/content/ccd-overlay.xul 2012-01-22 22:19:49 +0000 @@ -0,0 +1,44 @@ + + + + + +