From a2e24cbabdfe406547d67d17e7b48bc62314e709 Mon Sep 17 00:00:00 2001
From: "Berend Cornelius [:berend]" <berend.cornelius@sun.com>
Date: Sat, 6 Dec 2008 11:55:28 +0100
Subject: [PATCH] Bug 467069 -  consolidate decorated-month-view-binding and
 decorated-multiday-view-binding;r=philipp

---
 calendar/base/content/calendar-month-view.xml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/calendar/base/content/calendar-month-view.xml b/calendar/base/content/calendar-month-view.xml
index 9a5cdf5523..78b276305d 100644
--- a/calendar/base/content/calendar-month-view.xml
+++ b/calendar/base/content/calendar-month-view.xml
@@ -416,17 +416,10 @@
         this.calendarView.setSelectedItems(0, []);
       ]]></handler>
       <handler event="DOMMouseScroll"><![CDATA[
-        if (event.originalTarget.getAttribute("anonid") != "day-label") {
-          // Finding out if the box is overflowing is tricky, but fortunately
-          // the height of the boxes is equal.
-          var childHeight = (this.dayitems.firstChild ?
-                             this.dayitems.firstChild.boxObject.height *
-                             this.dayitems.childNodes.length : 0);
-          if (this.dayitems.boxObject.height < childHeight) {
-            // The box is overflowing. Stop propagation and let the default
-            // event handler take care of scrolling
-            event.stopPropagation();
-          }
+        if (getParentNodeOrThisByAttribute(event.originalTarget, "anonid", "day-label") == null) {
+            if (this.dayitems.scrollHeight > this.dayitems.clientHeight) {
+                event.stopPropagation();
+            }
         }
       ]]></handler>
     </handlers>