From 46d273eb0185a4f49f2297081e418cb2c35329a2 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sun, 17 Oct 2010 00:09:18 -0500 Subject: [PATCH] Wrap `element` in `$` for Element#cumulativeOffset, #viewportOffset, #positionedOffset, and #getOffsetParent. [#782 state:resolved] (Radoslav Stankov, Andrew Dupont) --- CHANGELOG | 2 ++ src/dom/layout.js | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 86636a619..f92518931 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Wrap `element` in `$` for Element#cumulativeOffset, #viewportOffset, #positionedOffset, and #getOffsetParent. [#782 state:resolved] (Radoslav Stankov, Andrew Dupont) + *1.7_rc3* (October 11, 2010) * Feature detect IE's legacy event system, since IE9 now supports DOM L2 Events. (Michael Sciacqua, kangax, Andrew Dupont) diff --git a/src/dom/layout.js b/src/dom/layout.js index 5b07cf185..8b6276b82 100644 --- a/src/dom/layout.js +++ b/src/dom/layout.js @@ -849,6 +849,7 @@ * `body` element is returned. **/ function getOffsetParent(element) { + element = $(element); if (isDetached(element)) return $(document.body); // IE reports offset parent incorrectly for inline elements. @@ -873,6 +874,7 @@ * document. **/ function cumulativeOffset(element) { + element = $(element); var valueT = 0, valueL = 0; if (element.parentNode) { do { @@ -891,6 +893,8 @@ * (the element that would be returned by [[Element.getOffsetParent]]). **/ function positionedOffset(element) { + element = $(element); + // Account for the margin of the element. var layout = element.getLayout(); @@ -934,6 +938,7 @@ * Returns the X/Y coordinates of element relative to the viewport. **/ function viewportOffset(forElement) { + element = $(element); var valueT = 0, valueL = 0, docBody = document.body; var element = forElement; @@ -1059,6 +1064,7 @@ // positioned. For performance reasons, redefine Element#cumulativeOffset for // KHTML/WebKit only. cumulativeOffset = function(element) { + element = $(element); var valueT = 0, valueL = 0; do { valueT += element.offsetTop || 0;