X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=fafed0ea0b3428f300a296e5b7862f6fcb8fb5ee;hb=894fc4b280b9ea967a4da08ce6b26462837b033f;hp=4a9614c5ce0a65dd54ee7cecc648173932ed4ac5;hpb=25f5af1bcb7581e5e8462201781665e8ec637972;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 4a9614c..fafed0e 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -320,12 +320,18 @@ function $(a,c) {
 
 (function(){
 	var b = navigator.userAgent.toLowerCase();
+
+	// Figure out what browser is being used
 	$.browser =
-		( /safari/.test(b) && "safari" ) ||
+		( /webkit/.test(b) && "safari" ) ||
 		( /opera/.test(b) && "opera" ) ||
 		( /msie/.test(b) && "msie" ) ||
 		( !/compatible/.test(b) && "mozilla" ) ||
 		"other";
+
+	// Check to see if the W3C box model is being used
+	$.boxModel = ( $.browser != "msie" || 
+		document.compatMode == "CSS1Compat" );
 })();
 
 $.apply = function(o,f,a) {
@@ -347,24 +353,39 @@ $.apply = function(o,f,a) {
 $.getCSS = function(e,p) {
 	// Adapted from Prototype 1.4.0
 	if ( p == 'height' || p == 'width' ) {
-		if ($.getCSS(e,"display") != 'none') {
-			return p == 'height' ?
-				e.offsetHeight || parseInt(e.style.height,10) : 
-				e.offsetWidth || parseInt(e.style.width,10);
+
+		// Handle extra width/height provided by the W3C box model
+		var ph = !$.boxModel ? 0 : 
+			parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom")) +
+			parseInt($.css(e,"borderTop")) + parseInt($.css(e,"borderBottom"));
+
+		var pw = !$.boxModel ? 0 : 
+			parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight")) +
+			parseInt($.css(e,"borderLeft")) + parseInt($.css(e,"borderRight"));
+
+		var oHeight, oWidth;
+
+		if ($.css(e,"display") != 'none') {
+			oHeight = e.offsetHeight || parseInt(e.style.height,10);
+			oWidth = e.offsetWidth || parseInt(e.style.width,10);
+		} else {
+			var els = e.style;
+			var ov = els.visibility;
+			var op = els.position;
+			var od = els.display;
+			els.visibility = 'hidden';
+			els.position = 'absolute';
+			els.display = '';
+			oHeight = e.clientHeight || parseInt(e.style.height,10);
+			oWidth = e.clientWidth || parseInt(e.style.width,10);
+			els.display = od;
+			els.position = op;
+			els.visibility = ov;
 		}
-		var els = e.style;
-		var ov = els.visibility;
-		var op = els.position;
-		var od = els.display;
-		els.visibility = 'hidden';
-		els.position = 'absolute';
-		els.display = '';
-		var oHeight = e.clientHeight || parseInt(e.style.height,10);
-		var oWidth = e.clientWidth || parseInt(e.style.width,10);
-		els.display = od;
-		els.position = op;
-		els.visibility = ov;
-		return p == 'height' ? oHeight : oWidth;
+
+		return p == 'height' ?
+			(oHeight - ph < 0 ? 0 : oHeight - ph) :
+			(oWidth - pw < 0 ? 0 : oWidth - pw);
 	}
 	
 	if (e.style[p]) {
@@ -388,7 +409,6 @@ $.clean = function(a) {
 	for ( var i = 0; i < a.length; i++ ) {
 		if ( a[i].constructor == String ) {
 			if ( a[i].indexOf("<tr") == 0 ) {
-//alert("tr");
 				var tr = true;
 				a[i] = "<table>" + a[i] + "</table>";
 			}
@@ -414,7 +434,7 @@ $.clean = function(a) {
 
 $.g = {
 	'': "m[2] == '*' || a.nodeName.toUpperCase() == m[2].toUpperCase()",
-	'#': "a.attributes['id'].nodeValue == m[2]",
+	'#': "a.getAttribute('id') && a.getAttribute('id').nodeValue == m[2]",
 	':': {
 		lt: "i < m[3]-0",
 		gt: "i > m[3]-0",
@@ -587,8 +607,7 @@ $.attr = function(o,a,v){
 			'for': 'htmlFor',
 			'text': 'cssText',
 			'class': 'className',
-			'float': 'cssFloat',
-			'style': 'cssText'
+			'float': 'cssFloat'
 		};
 		a = (fix[a] && fix[a].replace && fix[a]) || a;
 		var r = new RegExp("-([a-z])","ig");
@@ -758,7 +777,12 @@ $.event = {};
 // Bind an event to an element
 // Original by Dean Edwards
 $.event.add = function(element, type, handler) {
-	if ( element.location ) { element = window; } // Ughhhhh....
+	// For whatever reason, IE has trouble passing the window object
+	// around, causing it to be cloned in the process
+	if ( $.browser == "msie" && typeof element.setInterval != "undefined" ) {
+		element = window;
+	}
+
 	if (!handler.$$guid) { handler.$$guid = $.event.add.guid++; }
 	if (!element.events) { element.events = {}; }
 	var handlers = element.events[type];
@@ -794,7 +818,7 @@ $.event.remove = function(element, type, handler) {
 };
 
 $.event.trigger = function(element,type,data) {
-	data = data || [{ type: type }];
+	data = data || [ $.event.fix({ type: type }) ];
 	if ( element && element["on" + type] ) {
 		$.apply( element, element["on" + type], data );
 	}