Changed the window.location hack to be more specific (and documented).

[jquery.git] / jquery / jquery.js

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 75dd907..7577936 100644 (file)
--- 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,10 +353,15 @@ $.apply = function(o,f,a) {
 $.getCSS = function(e,p) {
        // Adapted from Prototype 1.4.0
        if ( p == 'height' || p == 'width' ) {
-               var ph = $.browser == "msie" ? 0 : 
-                       parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom"));
-               var pw = $.browser == "msie" ? 0 : 
-                       parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight"));
+
+               // 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;
 
@@ -365,7 +376,7 @@ $.getCSS = function(e,p) {
                        els.visibility = 'hidden';
                        els.position = 'absolute';
                        els.display = '';
-                       oHeight = e.clientHeight - ph || parseInt(e.style.height,10);
+                       oHeight = e.clientHeight || parseInt(e.style.height,10);
                        oWidth = e.clientWidth || parseInt(e.style.width,10);
                        els.display = od;
                        els.position = op;
@@ -398,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>";
                        }
@@ -424,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",
@@ -768,7 +778,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];
@@ -804,7 +819,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 );
        }