library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Fixed a bug in jQuery.fn.offset relating to the calculation of scroll offsets.

Browse Source 
* Fixed jQuery.fn.height and jQuery.fn.width to properly pass on a value for setting the height and width of an element if passed in.
This commit is contained in:
Brandon Aaron 2006-10-10 02:41:44 +00:00
parent dbee06de85
commit 016bd18ba3
1 changed files with 311 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/dimensions/dimensions.js
View File

@ -30,7 +30,7 @@ jQuery.fn.height = function() {
if ( this.get(0) == document ) if ( this.get(0) == document )
return Math.max( document.body.scrollHeight, document.body.offsetHeight ); return Math.max( document.body.scrollHeight, document.body.offsetHeight );
return this.css("height"); return this.css("height", arguments[0]);
}; };
/** /**
@ -60,7 +60,7 @@ jQuery.fn.width = function() {
if ( this.get(0) == document ) if ( this.get(0) == document )
return Math.max( document.body.scrollWidth, document.body.offsetWidth ); return Math.max( document.body.scrollWidth, document.body.offsetWidth );
return this.css("width"); return this.css("width", arguments[0]);
}; };
/** /**
@ -252,37 +252,36 @@ jQuery.fn.offset = function(refElem) {
if (!this[0]) throw 'jQuery.fn.offset requires an element.'; if (!this[0]) throw 'jQuery.fn.offset requires an element.';
refElem = (refElem) ? jQuery(refElem)[0] : null; refElem = (refElem) ? jQuery(refElem)[0] : null;
var x = 0, y = 0, elm = this[0], parent = this[0], pos = null, borders = [0,0], isElm = true, sl = 0, st = 0; var x = 0, y = 0, elem = this[0], parent = this[0], sl = 0, st = 0;
do { do {
if (parent.tagName == 'BODY' || parent.tagName == 'HTML') { if (parent.tagName == 'BODY' || parent.tagName == 'HTML') {
// Safari and IE don't add margin for static and relative // Safari and IE don't add margin for static and relative
if ((jQuery.browser.safari || jQuery.browser.msie) && pos != 'absolute') { if ((jQuery.browser.safari || jQuery.browser.msie) && jQuery.css(parent, 'position') != 'absolute') {
x += parseInt(jQuery.css(parent, 'marginLeft')) || 0; x += parseInt(jQuery.css(parent, 'marginLeft')) || 0;
y += parseInt(jQuery.css(parent, 'marginTop')) || 0; y += parseInt(jQuery.css(parent, 'marginTop')) || 0;
} }
break; break;
} }
pos = jQuery.css(parent, 'position'); x += parent.offsetLeft || 0;
border = [parseInt(jQuery.css(parent, 'borderLeftWidth')) || 0, y += parent.offsetTop || 0;
parseInt(jQuery.css(parent, 'borderTopWidth')) || 0];
sl = parent.scrollLeft;
st = parent.scrollTop;
x += (parent.offsetLeft || 0) + border[0] - sl; // Mozilla and IE do not add the border
y += (parent.offsetTop || 0) + border[1] - st; if (jQuery.browser.mozilla || jQuery.browser.msie) {
x += parseInt(jQuery.css(parent, 'borderLeftWidth')) || 0;
// Safari and Opera include the border already for parents with position = absolute|relative y += parseInt(jQuery.css(parent, 'borderTopWidth')) || 0;
if ((jQuery.browser.safari || jQuery.browser.opera) && !isElm && (pos == 'absolute' || pos == 'relative')) {
x -= border[0];
y -= border[1];
} }
parent = parent.offsetParent; // Need to get scroll offsets in-between offsetParents
isElm = false; var op = parent.offsetParent;
do {
sl += parent.scrollLeft || 0;
st += parent.scrollTop || 0;
parent = parent.parentNode;
} while (parent != op);
} while (parent); } while (parent);
if (refElem) { if (refElem) { // Get the relative offset
var offset = jQuery(refElem).offset(); var offset = jQuery(refElem).offset();
x = x - offset.left; x = x - offset.left;
y = y - offset.top; y = y - offset.top;
@ -290,15 +289,21 @@ jQuery.fn.offset = function(refElem) {
st = st - offset.scrollTop; st = st - offset.scrollTop;
} }
// Safari and Opera do not add the border for the element
if (jQuery.browser.safari || jQuery.browser.opera) {
x += parseInt(jQuery.css(elem, 'borderLeftWidth')) || 0;
y += parseInt(jQuery.css(elem, 'borderTopWidth')) || 0;
}
return { return {
top: y, top: y - st,
left: x, left: x - sl,
width: elm.offsetWidth, width: elem.offsetWidth,
height: elm.offsetHeight, height: elem.offsetHeight,
borderTop: parseInt(jQuery.css(elm, 'borderTopWidth')) || 0, borderTop: parseInt(jQuery.css(elem, 'borderTopWidth')) || 0,
borderLeft: parseInt(jQuery.css(elm, 'borderLeftWidth')) || 0, borderLeft: parseInt(jQuery.css(elem, 'borderLeftWidth')) || 0,
marginTop: parseInt(jQuery.css(elm, 'marginTopWidth')) || 0, marginTop: parseInt(jQuery.css(elem, 'marginTopWidth')) || 0,
marginLeft: parseInt(jQuery.css(elm, 'marginLeftWidth')) || 0, marginLeft: parseInt(jQuery.css(elem, 'marginLeftWidth')) || 0,
scrollTop: st, scrollTop: st,
scrollLeft: sl, scrollLeft: sl,
pageYOffset: window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0, pageYOffset: window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0,