Side navigation
Ticket #4456: offset.diff
File offset.diff, 3.2 KB (added by pbcomm, March 31, 2009 03:17AM UTC)
Offset diff
diff U3 offset.js offset.js
--- offset.js Mon Mar 30 22:31:00 2009
+++ offset.js Mon Mar 30 22:52:10 2009
@@ -5,8 +5,8 @@
if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
- top = box.top + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop,
- left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+ top = box.top + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop,
+ left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
return { top: top, left: left };
};
else
@@ -52,7 +52,7 @@
jQuery.offset = {
initialize: function() {
- var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, prop, bodyMarginTop = parseFloat(jQuery.curCSS(body, 'marginTop', true), 10) || 0,
+ var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat(jQuery.curCSS(body, 'marginTop', true), 10) || 0,
html = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';
jQuery.extend( container.style, { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' } );
@@ -92,7 +92,7 @@
position: function() {
if ( !this[0] ) return null;
- var elem = this[0], left = 0, top = 0, results,
+ var elem = this[0], results,
// Get *real* offsetParent
offsetParent = this.offsetParent(),
@@ -122,7 +122,7 @@
offsetParent: function() {
var offsetParent = this[0].offsetParent || document.body;
- while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
+ while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') === 'static') )
offsetParent = offsetParent.offsetParent;
return jQuery(offsetParent);
}
@@ -140,7 +140,7 @@
// Set the scroll offset
this.each(function() {
- this == window || this == document ?
+ this === window || this === document ?
window.scrollTo(
!i ? val : jQuery(window).scrollLeft(),
i ? val : jQuery(window).scrollTop()
@@ -149,9 +149,9 @@
}) :
// Return the scroll offset
- this[0] == window || this[0] == document ?
+ this[0] === window || this[0] === document ?
self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
- jQuery.boxModel && document.documentElement[ method ] ||
+ jQuery.support.boxModel && document.documentElement[ method ] ||
document.body[ method ] :
this[0][ method ];
};
Download in other formats:
Original Format
File offset.diff, 3.2 KB (added by pbcomm, March 31, 2009 03:17AM UTC)
Offset diff
diff U3 offset.js offset.js
--- offset.js Mon Mar 30 22:31:00 2009
+++ offset.js Mon Mar 30 22:52:10 2009
@@ -5,8 +5,8 @@
if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
- top = box.top + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop,
- left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+ top = box.top + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop,
+ left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
return { top: top, left: left };
};
else
@@ -52,7 +52,7 @@
jQuery.offset = {
initialize: function() {
- var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, prop, bodyMarginTop = parseFloat(jQuery.curCSS(body, 'marginTop', true), 10) || 0,
+ var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat(jQuery.curCSS(body, 'marginTop', true), 10) || 0,
html = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';
jQuery.extend( container.style, { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' } );
@@ -92,7 +92,7 @@
position: function() {
if ( !this[0] ) return null;
- var elem = this[0], left = 0, top = 0, results,
+ var elem = this[0], results,
// Get *real* offsetParent
offsetParent = this.offsetParent(),
@@ -122,7 +122,7 @@
offsetParent: function() {
var offsetParent = this[0].offsetParent || document.body;
- while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
+ while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') === 'static') )
offsetParent = offsetParent.offsetParent;
return jQuery(offsetParent);
}
@@ -140,7 +140,7 @@
// Set the scroll offset
this.each(function() {
- this == window || this == document ?
+ this === window || this === document ?
window.scrollTo(
!i ? val : jQuery(window).scrollLeft(),
i ? val : jQuery(window).scrollTop()
@@ -149,9 +149,9 @@
}) :
// Return the scroll offset
- this[0] == window || this[0] == document ?
+ this[0] === window || this[0] === document ?
self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
- jQuery.boxModel && document.documentElement[ method ] ||
+ jQuery.support.boxModel && document.documentElement[ method ] ||
document.body[ method ] :
this[0][ method ];
};