Split apart jQuery.css into jQuery.css (computed values) and jQuery.style (currently...

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index 5d283aa..c472f98 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -105,7 +105,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 
 jQuery.offset = {
        initialize: function() {
-               var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop", undefined, true) ) || 0,
+               var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 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" } );
@@ -144,8 +144,8 @@ jQuery.offset = {
                jQuery.offset.initialize();
 
                if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-                       top  += parseFloat( jQuery.css(body, "marginTop", undefined, true) ) || 0;
-                       left += parseFloat( jQuery.css(body, "marginLeft", undefined, true) ) || 0;
+                       top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+                       left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
                }
 
                return { top: top, left: left };
@@ -161,8 +161,8 @@ jQuery.offset = {
 
                var curElem = jQuery( elem ),
                        curOffset = curElem.offset(),
-                       curCSSTop = jQuery.css( elem, "top", undefined, true ),
-                       curCSSLeft = jQuery.css( elem, "left", undefined, true ),
+                       curCSSTop = jQuery.css( elem, "top" ),
+                       curCSSLeft = jQuery.css( elem, "left" ),
                        calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
                        props = {}, curPosition = {}, curTop, curLeft;
 
@@ -212,12 +212,12 @@ jQuery.fn.extend({
                // Subtract element margins
                // note: when an element has margin: auto the offsetLeft and marginLeft
                // are the same in Safari causing offset.left to incorrectly be 0
-               offset.top  -= parseFloat( jQuery.css(elem, "marginTop", undefined, true) ) || 0;
-               offset.left -= parseFloat( jQuery.css(elem, "marginLeft", undefined, true) ) || 0;
+               offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+               offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
 
                // Add offsetParent borders
-               parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth", undefined, true) ) || 0;
-               parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth", undefined, true) ) || 0;
+               parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+               parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
 
                // Subtract the two offsets
                return {