Rolled back Joern's changes. They've been moved to another branch, and will be merged...

[jquery.git] / src / dimensions / dimensions.js

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