Fixed height/width issues that happend due to the box model, in $.css().

[jquery.git] / jquery / jquery.js

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 9f35e1a..75dd907 100644 (file)
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -347,24 +347,34 @@ $.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);
+               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"));
+
+               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 - ph || 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]) {
@@ -387,8 +397,16 @@ $.clean = function(a) {
        var r = [];
        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>";
+                       }
                        var div = document.createElement("div");
                        div.innerHTML = a[i];
+                       if ( tr ) {
+                               div = div.firstChild.firstChild;
+                       }
                        for ( var j = 0; j < div.childNodes.length; j++ ) {
                                r[r.length] = div.childNodes[j];
                        }
@@ -569,7 +587,7 @@ $.Select = function( t, context ) {
 };
 
 $.tag = function(a,b){
-       return a && typeof a.getElementsByTagName != "undefined" ?
+       return a && typeof a.getElementsByTagName != 'undefined' ?
                a.getElementsByTagName( b ) : [];
 };
 
@@ -579,7 +597,8 @@ $.attr = function(o,a,v){
                        'for': 'htmlFor',
                        'text': 'cssText',
                        'class': 'className',
-                       'float': 'cssFloat'
+                       'float': 'cssFloat',
+                       'style': 'cssText'
                };
                a = (fix[a] && fix[a].replace && fix[a]) || a;
                var r = new RegExp("-([a-z])","ig");