Changeset 8799

Timestamp:

02/03/08 22:29:29 (8 months ago)

Author:

tobie

Message:

prototype: Prevent Element#cumulativeOffset, Element#getOffsetParent, Element#positionedOffset, Element#viewportOffset and Element#clonePosition from throwing an error in IE when called on a parent-less element. Closes #9416, #10192, #10248.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/dom.js (modified) (3 diffs)
• spinoffs/prototype/trunk/test/unit/dom.html (modified) (3 diffs)

spinoffs/prototype/trunk/CHANGELOG

@@ +1 @@
+* Prevent Element#cumulativeOffset, Element#getOffsetParent, Element#positionedOffset, Element#viewportOffset and Element#clonePosition from throwing an error in IE when called on a parent-less element. Closes #9416, #10192, #10248. [ronstoney, psiborg, kangax]
+
-* Prevent Enumerable#eachSlice from entering into an endless loop if passed an argument smaller than 1. Closes #10665. [kangax, Tobie Langel]
-

spinoffs/prototype/trunk/src/dom.js

@@ -718 +718 @@
-    function(proceed, element) {
-      element = $(element);
+      // IE throws an error if element is not in document
+      try { element.offsetParent }
+      catch(e) { return $(document.body) }
-      var position = element.getStyle('position');
-      if (position !== 'static') return proceed(element);
@@ -731 +734 @@
-      function(proceed, element) {
-        element = $(element);
+        try { element.offsetParent }
+        catch(e) { return Element._returnOffset(0,0) }
-        var position = element.getStyle('position');
-        if (position !== 'static') return proceed(element);
@@ -745 +750 @@
-    );
-  });
+  
+  Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
+    function(proceed, element) {
+      try { element.offsetParent }
+      catch(e) { return Element._returnOffset(0,0) }
+      return proceed(element);
+    }
+  );
-    
-  Element.Methods.getStyle = function(element, style) {

spinoffs/prototype/trunk/test/unit/dom.html

@@ -1619 +1619 @@
-      assertEnumEqual([afu.offsetLeft, afu.offsetTop],
-        afu.positionedOffset());
+        
+      var element = new Element('div'), offset = element.positionedOffset();
+      assertEnumEqual([0,0], offset);
+      assertIdentical(0, offset.top);
+      assertIdentical(0, offset.left);
+    }},
+    
+    testCumulativeOffset: function() {with(this) {
+      var element = new Element('div'), offset = element.cumulativeOffset();
+      assertEnumEqual([0,0], offset);
+      assertIdentical(0, offset.top);
+      assertIdentical(0, offset.left);
-    }},
-    
@@ -1630 +1642 @@
-      assertEnumEqual([20,30],
-        $('absolute_relative_undefined').viewportOffset());
+      var element = new Element('div'), offset = element.viewportOffset();
+      assertEnumEqual([0,0], offset);
+      assertIdentical(0, offset.top);
+      assertIdentical(0, offset.left);
-    }},
-    
@@ -1637 +1653 @@
-      assertEqual('absolute_relative', $('inline').getOffsetParent().id);
-      assertEqual('absolute_relative', $('absolute_relative_undefined').getOffsetParent().id);
+      
+      assertEqual(document.body, new Element('div').getOffsetParent());
-    }},
-