library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2025-01-10 18:24:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Resig 2006-06-15 02:27:18 +00:00
parent ba7ebaf70b
commit dea1925049
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fx/fx.js
View File

@ -99,8 +99,8 @@ $.fx = function(el,op,ty,tz){
z.el = el.constructor==String?document.getElementById(el):el; z.el = el.constructor==String?document.getElementById(el):el;
var y = z.el.style; var y = z.el.style;
z.a = function(){z.el.style[ty]=z.now+z.o.unit;}; z.a = function(){z.el.style[ty]=z.now+z.o.unit;};
z.max = function(){return z.el["io"+ty]||z.el["natural"+tz]||z.el["scroll"+tz]||z.cur();}; z.max = function(){return z.el["io"+ty]||z.cur();};
z.cur = function(){return parseInt($.getCSS(z.el,ty),10);}; z.cur = function(){return $.css(z.el,ty);};
z.show = function(){z.ss("block");z.o.auto=true;z.custom(0,z.max());}; z.show = function(){z.ss("block");z.o.auto=true;z.custom(0,z.max());};
z.hide = function(){z.el.$o=$.getCSS(z.el,"overflow");z.el["io"+ty]=this.cur();z.custom(z.cur(),0);}; z.hide = function(){z.el.$o=$.getCSS(z.el,"overflow");z.el["io"+ty]=this.cur();z.custom(z.cur(),0);};
z.ss = function(a){if(y.display!=a){y.display=a;}}; z.ss = function(a){if(y.display!=a){y.display=a;}};

26
jquery/jquery.js vendored
View File

@ -347,11 +347,17 @@ $.apply = function(o,f,a) {
$.getCSS = function(e,p) { $.getCSS = function(e,p) {
// Adapted from Prototype 1.4.0 // Adapted from Prototype 1.4.0
if ( p == 'height' || p == 'width' ) { if ( p == 'height' || p == 'width' ) {
if ($.getCSS(e,"display") != 'none') { var ph = $.browser == "msie" ? 0 :
return p == 'height' ? parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom"));
e.offsetHeight || parseInt(e.style.height,10) : var pw = $.browser == "msie" ? 0 :
e.offsetWidth || parseInt(e.style.width,10); 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 els = e.style;
var ov = els.visibility; var ov = els.visibility;
var op = els.position; var op = els.position;
@ -359,12 +365,16 @@ $.getCSS = function(e,p) {
els.visibility = 'hidden'; els.visibility = 'hidden';
els.position = 'absolute'; els.position = 'absolute';
els.display = ''; els.display = '';
var oHeight = e.clientHeight || parseInt(e.style.height,10); oHeight = e.clientHeight - ph || parseInt(e.style.height,10);
var oWidth = e.clientWidth || parseInt(e.style.width,10); oWidth = e.clientWidth || parseInt(e.style.width,10);
els.display = od; els.display = od;
els.position = op; els.position = op;
els.visibility = ov; 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]) { if (e.style[p]) {