Commit c0cdbf8b authored by Brandon Aaron's avatar Brandon Aaron

fix for #4263, better support for nested fixed position elements

parent 7c04a640
...@@ -23,6 +23,7 @@ else ...@@ -23,6 +23,7 @@ else
top = elem.offsetTop, left = elem.offsetLeft; top = elem.offsetTop, left = elem.offsetLeft;
while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) { while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) break;
computedStyle = defaultView.getComputedStyle(elem, null); computedStyle = defaultView.getComputedStyle(elem, null);
top -= elem.scrollTop, left -= elem.scrollLeft; top -= elem.scrollTop, left -= elem.scrollLeft;
if ( elem === offsetParent ) { if ( elem === offsetParent ) {
...@@ -42,7 +43,7 @@ else ...@@ -42,7 +43,7 @@ else
top += body.offsetTop, top += body.offsetTop,
left += body.offsetLeft; left += body.offsetLeft;
if ( prevComputedStyle.position === "fixed" ) if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" )
top += Math.max(docElem.scrollTop, body.scrollTop), top += Math.max(docElem.scrollTop, body.scrollTop),
left += Math.max(docElem.scrollLeft, body.scrollLeft); left += Math.max(docElem.scrollLeft, body.scrollLeft);
...@@ -64,6 +65,10 @@ jQuery.offset = { ...@@ -64,6 +65,10 @@ jQuery.offset = {
this.doesNotAddBorder = (checkDiv.offsetTop !== 5); this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
this.doesAddBorderForTableAndCells = (td.offsetTop === 5); this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
checkDiv.style.position = 'fixed', checkDiv.style.top = '20px';
this.supportsFixedPosition = (checkDiv.offsetTop >= 15); // safari subtracts parent border width here which is 5px
checkDiv.style.position = '', checkDiv.style.top = '';
innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative'; innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative';
this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5); this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment