From a0532bd933964e1fc589bbd2609c936b44d71fee Mon Sep 17 00:00:00 2001 From: Thomas Fuchs Date: Thu, 5 Apr 2007 12:50:59 +0000 Subject: [PATCH] Rolling back #7683 as it breaks existing effects in certain scenarios --- CHANGELOG | 2 -- src/dom.js | 33 ++++++++++++++------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9329130..90fa032 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,8 +13,6 @@ * Fix issues with Selector an+b logic, :not support, attribute selector double quotes, plus performance improvements. Closes #7873, #7901. [Andrew Dupont] -* Fix an issue with Element.getDimensions with some element types on non-IE browsers. Closes #7683. [Andrew Dupont] - * Fix Form.disable to work again on non-form elements. Closes #6887. [Mislav Marohnić] * Fix an issue with String.prototype.endsWith. Closes #7822. [altblue] diff --git a/src/dom.js b/src/dom.js index bfa5649..7c4de17 100644 --- a/src/dom.js +++ b/src/dom.js @@ -346,28 +346,23 @@ Element.Methods = { element = $(element); var display = $(element).getStyle('display'); if (display != 'none' && display != null) // Safari bug - return { width: element.offsetWidth, height: element.offsetHeight }; - + return {width: element.offsetWidth, height: element.offsetHeight}; + // All *Width and *Height properties give 0 on elements with display none, // so enable the element temporarily - var els = element.style, original = {}; - - $w('display position visibility height width').each( function(name) { - original[name] = els[name]; - }); - - els.visibility = 'hidden'; - els.display = 'block'; - - Position.absolutize(element); - var originalWidth = element.clientWidth; + var els = element.style; + var originalVisibility = els.visibility; + var originalPosition = els.position; + var originalDisplay = els.display; + els.visibility = 'hidden'; + els.position = 'absolute'; + els.display = 'block'; + var originalWidth = element.clientWidth; var originalHeight = element.clientHeight; - Position.relativize(element); - - $w('display position visibility height width').each( function(name) { - els[name] = original[name] || ''; - }); - return { width: originalWidth, height: originalHeight }; + els.display = originalDisplay; + els.position = originalPosition; + els.visibility = originalVisibility; + return {width: originalWidth, height: originalHeight}; }, makePositioned: function(element) {