Applied the RegExp issues reported by Jeff Robinson here: http://jmrware.com/articles...

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index c472f98..a3776c2 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -1,5 +1,8 @@
 (function( jQuery ) {
 
+var rtable = /^t(?:able|d|h)$/i,
+       rroot = /^(?:body|html)$/i;
+
 if ( "getBoundingClientRect" in document.documentElement ) {
        jQuery.fn.offset = function( options ) {
                var elem = this[0];
@@ -72,7 +75,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
                                top  += elem.offsetTop;
                                left += elem.offsetLeft;
 
-                               if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
+                               if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
                                        top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
                                        left += parseFloat( computedStyle.borderLeftWidth ) || 0;
                                }
@@ -207,7 +210,7 @@ jQuery.fn.extend({
 
                // Get correct offsets
                offset       = this.offset(),
-               parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+               parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
 
                // Subtract element margins
                // note: when an element has margin: auto the offsetLeft and marginLeft
@@ -229,7 +232,7 @@ jQuery.fn.extend({
        offsetParent: function() {
                return this.map(function() {
                        var offsetParent = this.offsetParent || document.body;
-                       while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+                       while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
                                offsetParent = offsetParent.offsetParent;
                        }
                        return offsetParent;