Fixed CalendarViewController interface to correctly deal with Occurrences instead of events; selection & event deleting via keyboard

calendar/base/content/calendar-multiday-view.css

@@ -147,6 +147,7 @@ calendar-time-bar {
 /*== calendar-multiday-view ==*/
 calendar-multiday-view { 
   -moz-binding: url(chrome://calendar/content/calendar-multiday-view.xml#calendar-multiday-view);
+  -moz-user-focus: normal;
 }
 
 .calendar-day-label-box { 

calendar/base/content/calendar-multiday-view.xml

@@ -216,25 +216,20 @@
 
     <handlers>
       <handler event="mousedown" phase="capturing" button="0"><![CDATA[
-	dump("mousedown\n");
 	this.mResizing = true;
 	this.mSizeStartX = event.screenX;
 	this.mSizeStartY = event.screenY;
-	dump ("ev.t: " + event.target + " bo: " + event.target.boxObject + "\n");
-	event.target.boxObject.captureMouseEvents = true;
 	event.preventDefault();
       ]]></handler>
 
       <handler event="mousemove" phase="capturing"><![CDATA[
 	if (!this.mResizing)
 	  return;
-	dump("mousemove\n");
       ]]></handler>
 
       <handler event="mouseup" phase="capturing"><![CDATA[
 	if (!this.mResizing)
 	  return;
-	dump("mouseup\n");
 	this.mResizing = false;
 	event.target.boxObject.captureMouseEvents = false;
       ]]></handler>
@@ -445,13 +440,20 @@
            var itemIndex = -1;
            var i;
            for (i = 0; i < this.mEvents.length; i++) {
-               if (this.mEvents[i].event == aOccurrence) {
+               occ = this.mEvents[i].event;
+               if (occ.item == aOccurrence.item &&
+                   occ.occurrenceStartDate.compare(aOccurrence.occurrenceStartDate) == 0 &&
+                   occ.occurrenceEndDate.compare(aOccurrence.occurrenceEndDate) == 0)
+               {
                    itemIndex = i;
                    break;
                }
            }
 
            if (itemIndex != -1) {
+               if (this.mSelectedOccurrence == this.mEvents[itemIndex])
+                   this.mSelectedOccurrence = null;
+
                this.mEvents.splice(itemIndex, 1);
                return true;
            } else {
@@ -1087,15 +1089,13 @@
 
     <handlers>
       <handler event="mousedown">
-	dump ("event select\n");
 	this.calendarView.selectedOccurrence = this.mOccurrence;
 	event.preventBubble();
       </handler>
 
       <handler event="dblclick"><![CDATA[
 	if (this.calendarView.controller && this.mOccurrence) {
-            this.calendarView.controller.modifyEvent(this.mOccurrence.item.parent,
-                                                     this.mOccurrence.item);
+            this.calendarView.controller.modifyOccurrence(this.mOccurrence);
         }
 	event.preventBubble();
       ]]></handler>
@@ -1192,22 +1192,23 @@
                 if (!(aNewItem instanceof Components.interfaces.calIEvent))
                     return;
 
-                var occs = aOldItem.getOccurrencesBetween(this.calView.startDate,
-                                                          this.calView.endDate,
-                                                          {});
+                var occs;
+                occs = aOldItem.getOccurrencesBetween(this.calView.startDate,
+                                                      this.calView.endDate,
+                                                      {});
                 for each (occ in occs) {
                     this.calView.doDeleteEvent(occ);
                 }
 
-                var occs = aNewItem.getOccurrencesBetween(this.calView.startDate,
-                                                          this.calView.endDate,
-                                                          {});
+                occs = aNewItem.getOccurrencesBetween(this.calView.startDate,
+                                                      this.calView.endDate,
+                                                      {});
                 for each (occ in occs) {
                     this.calView.doAddEvent(occ);
                 }
             },
             onDeleteItem: function (aItem) {
-                dump ("++ DeleteItem\n");
+                //dump ("++ DeleteItem\n");
                 if (!(aItem instanceof Components.interfaces.calIEvent))
                     return;
 
@@ -1227,12 +1228,12 @@
             // XXXvv we can be smarter about how we handle this stuff
             //
             onCalendarAdded: function (aCalendar) {
-                dump ("view onCalendarAdded\n");
+                //dump ("view onCalendarAdded\n");
                 this.calView.refresh();
             },
 
             onCalendarRemoved: function (aCalendar) {
-                dump ("view onCalendarRemoved\n");
+                //dump ("view onCalendarRemoved\n");
                 this.calView.refresh();
             },
 
@@ -1248,7 +1249,7 @@
 
           onOperationComplete: function(aCalendar, aStatus, aOperationType, aId, aDetail) {
               // nothing to do
-              dump ("+++ OnOperationComplete (detail: " + aDetail + ")");
+              //dump ("+++ OnOperationComplete (detail: " + aDetail + ")\n");
           },
           onGetResult: function(aCalendar, aStatus, aItemType, aDetail, aCount, aItems) {
               if (!Components.isSuccessCode(aStatus))
@@ -1306,7 +1307,7 @@
 	<parameter name="aStartDate"/>
 	<parameter name="aEndDate"/>
 	<body><![CDATA[
-	  dump ("setDateRange\n");
+	  //dump ("setDateRange\n");
 	  this.mDateList = null;
 	  this.mStartDate = aStartDate.clone();
           this.mStartDate.makeImmutable();
@@ -1503,7 +1504,7 @@
           // start our items query; for a disjoint date range
           // we get all the items, and just filter out the ones we don't
           // care about in addItem
-          dump ("+++++++++ Calling getItems\n");
+          //dump ("+++++++++ Calling getItems\n");
           this.mCalendar.getItems(this.mCalendar.ITEM_FILTER_COMPLETED_ALL |
                                   this.mCalendar.ITEM_FILTER_TYPE_EVENT |
                                   this.mCalendar.ITEM_FILTER_CLASS_OCCURRENCES,
@@ -1638,7 +1639,7 @@
       <method name="doAddEvent">
 	<parameter name="aEvent"/>
 	<body><![CDATA[
-                     //dump ("++ doAddevent\n");
+          //dump ("++ doAddevent\n");
           var col = this.findColumnForEvent(aEvent);
           if (!col)
               return;
@@ -1688,6 +1689,16 @@
     </implementation>
 
     <handlers>
+      <handler event="keypress"><![CDATA[
+	const kKE = Components.interfaces.nsIDOMKeyEvent;
+	if (event.keyCode == kKE.DOM_VK_BACK_SPACE ||
+            event.keyCode == kKE.DOM_VK_DELETE)
+        {
+            if (this.selectedOccurrence && this.controller) {
+                this.controller.deleteOccurrence(this.selectedOccurrence);
+            }
+        }
+      ]]></handler>
     </handlers>
   </binding>
 </bindings>

calendar/base/public/calICalendar.idl

@@ -98,7 +98,7 @@ interface calICalendar : nsISupports
      ITEM_FILTER_TYPE_JOURNAL);
 
   /** 
-   * If set, return calIOccurence items, otherwise return subclasses of
+   * If set, return calIItemOccurence items, otherwise return subclasses of
    * calIItemBase.
    */
   const unsigned long ITEM_FILTER_CLASS_OCCURRENCES = 1 << 5;

calendar/base/public/calICalendarViewController.idl

@@ -42,6 +42,7 @@
 interface calICalendar;
 interface calIDateTime;
 interface calIEvent;
+interface calIItemOccurrence;
 
 [scriptable, uuid(1f783898-f4c2-4b2d-972e-360e0de38237)]
 interface calICalendarViewController : nsISupports
@@ -72,12 +73,18 @@ interface calICalendarViewController : nsISupports
 		       in calIDateTime aEndTime);
 
   /**
-   * Modify aEvent.  If aNewStartTime and aNewEndTime are given,
+   * Modify aOccurrence.  If aNewStartTime and aNewEndTime are given,
    * update the event to those times.  Otherwise ask the user to modify.
    */
-  void modifyEvent (in calICalendar aCalendar,
-		    in calIEvent aEvent,
-		    in calIDateTime aNewStartTime,
-		    in calIDateTime aNewEndTime);
+  void modifyOccurrence (in calIItemOccurrence aOccurrence,
+			 in calIDateTime aNewStartTime,
+			 in calIDateTime aNewEndTime);
+
+  /**
+   * Delete the given event.  This should prompt whether to delete
+   * just this occurrence or all occurrences, and do whatever else
+   * is appropriate.
+   */
+  void deleteOccurrence (in calIItemOccurrence aOccurrence);
 };
 

calendar/lightning/content/calendar-management.js

@@ -98,15 +98,30 @@ var ltnCalendarViewController = {
         }
     },
 
-    modifyEvent: function (aCalendar, aEvent, aNewStartTime, aNewEndTime) {
+    modifyOccurrence: function (aOccurrence, aNewStartTime, aNewEndTime) {
+        if (aOccurrence.recurrenceInfo) {
+            dump ("*** Don't know what to do in modifyOccurrence for a recurring event!\n");
+            return;
+        }
+
         if (aNewStartTime && aNewEndTime && !aNewStartTime.isDate && !aNewEndTime.isDate) {
-            var event = aEvent.clone();
+            var event = aOccurrence.item.clone();
             event.startDate = aNewStartTime;
             event.endDate = aNewEndTime;
-            aEvent.parent.modifyItem(event, null);
+            event.parent.modifyItem(event, null);
         } else {
-            modifyEventWithDialog(aEvent);
+            modifyEventWithDialog(aOccurrence.item);
         }
+    },
+
+    deleteOccurrence: function (aOccurrence) {
+        dump ("+++ deleteOccurrence\n");
+        if (aOccurrence.recurrenceInfo) {
+            dump ("*** Don't know what do in deleteOccurrence for a recurring event!\n");
+            return;
+        }
+
+        aOccurrence.item.parent.deleteItem(aOccurrence.item, null);
     }
 };