From f89e82da68bbbfe246ca67af0e2a3559d34ddaa2 Mon Sep 17 00:00:00 2001
From: Adam Shaw <arshaw@arshaw.com>
Date: Mon, 25 Jan 2010 23:05:57 -0800
Subject: [PATCH] tweaks, opera bugfix, optimized clearEvents

---
 src/agenda.js                     |  7 +++----
 src/grid.js                       |  2 +-
 src/jquery/jquery-uncompressed.js | 17 ++---------------
 src/util.js                       | 16 +++++++++-------
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/agenda.js b/src/agenda.js
index f2d380b..6a4986c 100644
--- a/src/agenda.js
+++ b/src/agenda.js
@@ -371,9 +371,8 @@ function Agenda(element, options, methods) {
 	
 	
 	function clearEvents() {
-		$.each(view.eventElements, function() { // TODO: move away from this, empty a container instead
-			this.remove();
-		});
+		daySegmentContainer.empty();
+		slotSegmentContainer.empty();
 		view._clearEvents(); // only clears the hashes
 	}
 	
@@ -892,7 +891,7 @@ function Agenda(element, options, methods) {
 			td = tr.find('td'),
 			innerDiv = td.find('div');
 		return Math.max(0, Math.round(
-			innerDiv.position().top + topCorrect(tr, td) - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
+			innerDiv.position().top + topCorrect(td) - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
 		));
 	}
 	
diff --git a/src/grid.js b/src/grid.js
index 1ef4d71..f5edf15 100644
--- a/src/grid.js
+++ b/src/grid.js
@@ -604,7 +604,7 @@ function _renderDaySegs(segRows, view, minLeft, maxLeft, getTr, dayContentLeft,
 		innerDiv = td.find('div.fc-day-content div')
 			.css('position', 'relative')
 			.height(''); // this is needed for IE7 to get an accurate position
-		top = innerDiv.position().top + topCorrect(tr, td);
+		top = innerDiv.position().top + topCorrect(td);
 		rowContentHeight = 0;
 		for (j=0; j<levels.length; j++) {
 			segs = levels[j];
diff --git a/src/jquery/jquery-uncompressed.js b/src/jquery/jquery-uncompressed.js
index 3be2ff1..9263574 100644
--- a/src/jquery/jquery-uncompressed.js
+++ b/src/jquery/jquery-uncompressed.js
@@ -752,7 +752,7 @@ jQuery.extend({
 			var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
 
 			function getWH() {
-				val = name == "width" ? getElmOffsetWidth2(elem) : getElmOffsetHeight(elem);
+				val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
 
 				if ( extra === "border" )
 					return;
@@ -767,7 +767,7 @@ jQuery.extend({
 				});
 			}
 
-			if ( getElmOffsetWidth1(elem) !== 0 )
+			if ( elem.offsetWidth !== 0 )
 				getWH();
 			else
 				jQuery.swap( elem, props, getWH );
@@ -4374,16 +4374,3 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 
 });
 })();
-
-function getElmOffsetWidth1(e) {
-	return e.offsetWidth;
-}
-
-function getElmOffsetWidth2(e) {
-	return e.offsetWidth;
-}
-
-function getElmOffsetHeight(e) {
-	return e.offsetHeight;
-}
-
diff --git a/src/util.js b/src/util.js
index 8e05b11..c4510c2 100644
--- a/src/util.js
+++ b/src/util.js
@@ -340,15 +340,17 @@ function vsides(e, includeMargins) {
 
 var topBug;
 
-function topCorrect(tr, td) {
-	if (topBug !== false && tr.is('tr')) {
-		var tbody = tr.parent(),
-			trTop = tr.position().top;
-		if (topBug == undefined) {
-			topBug = trTop != tr.children().position().top;
+function topCorrect(tr) { // tr/th/td or anything else
+	if (topBug !== false) {
+		var cell;
+		if (tr.is('th,td')) {
+			tr = (cell = tr).parent();
+		}
+		if (topBug == undefined && tr.is('tr')) {
+			topBug = tr.position().top != tr.children().position().top;
 		}
 		if (topBug) {
-			return tbody.position().top + trTop - (td ? td.position().top : 0);
+			return tr.parent().position().top + (cell ? tr.position().top - cell.position().top : 0);
 		}
 	}
 	return 0;