472300 - Consolidation of the Multiday-view and month-view

Status: VERIFIED FIXED

(Calendar :: Calendar Frontend, defect)

Description

[Berend Cornelius]

The following parts of these two bindings (base/content/calendar-multiday-view.xml#calendar-multiday-view and base/content/calendar-month-view.xml#calendar-month-view) can be consolidated:
The operationListener, the calIObserver, calICompositeObserver, and calIAlarmServiceObserver and the method "popRefreshQueue".

Comment 1

[Berend Cornelius]

Attachment: patch v. #1

The patch attached consolidates the mentioned code into base/content/calendar-base-view.xml#calendar-base-view. I aligned the code concerning the insertion of tasks without entrydate or duedate:
The rule, not to insert tasks tasks without entrydate or duedate was missing in the calendar-month-view. I discussed this over with Philipp beforehand.

Comment 2

[Berend Cornelius]

Attachment: patch v. #2

I forgot to replace the "vars" by "lets"...

Comment 3

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 355753 [details] [diff] [review]
patch v. #2

>+              function hasGoodDates(item) {
>+                  if (isToDo(item) && (!item.entryDate || !item.dueDate)) {
>+                      return false;
>+                  }
>+                  return true;
>+              }
>+              aItems = aItems.filter(hasGoodDates);
Don't modify the argument, I'd go with:
let items = aItems.filter(function(x) !isToDo(x) || (x.entryDate && x.dueDate));

>+
>+            QueryInterface: function QueryInterface(aIID) {
>+                if (!aIID.equals(Components.interfaces.calIObserver) &&
>+                    !aIID.equals(Components.interfaces.calIAlarmServiceObserver) &&
>+                    !aIID.equals(Components.interfaces.calICompositeObserver) &&
>+                    !aIID.equals(Components.interfaces.nsISupports)) {
>+                    throw Components.results.NS_ERROR_NO_INTERFACE;
Use cal.doQueryInterface()


>+                //dump ("occs: " + occs.length + "\n");
Remove comment

>+            },
>+            onModifyItem: function onModifyItem(aNewItem, aOldItem) {
blank line between functions


>+          if (!this.startDate || !this.endDate)
>+            return;
>+

>+
>+          if (!this.mCalendar)
>+              return;

>+                if (isToDo(aNewItem) && isToDo(aOldItem) &&
>+                    !this.calView.mTasksInView)
>+                    return;

>+          if(this.mTasksInView)
>+            filter |= this.mCalendar.ITEM_FILTER_TYPE_ALL;
>+          else
>+            filter |= this.mCalendar.ITEM_FILTER_TYPE_EVENT;


4x Missing brackets

r=philipp

Comment 4

[Berend Cornelius]

addressed the commments of philipp and pushed to commm-central:

http://hg.mozilla.org/comm-central/rev/6e86173f8691

-> fixed

Comment 5

[Andreas Treumann]

Checked (with litmus multiweek/month test cases and some additional ad-hoc testing) in lightning/sunbird build 20090113 -> VERIFIED