Changeset 8654

Timestamp:

01/18/08 04:31:23 (6 months ago)

Author:

andrew

Message:

Fix Element#descendantOf logic in IE. Closes #10413. [martymix, kamil.szot]

Files:

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

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix Element#descendantOf logic in IE. Closes #10413. [martymix, kamil.szot]
-
-* Fix missing "var" in Element#insert. Closes #10838. [Lantash]

spinoffs/prototype/trunk/src/dom.js

@@ -375 +375 @@
-        while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-      }
-
+
+
-    }
-    

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

@@ -92 +92 @@
-    }
-    
+    #getStyle_test {
+      margin-left: 2em;
+      margin-right: 0.1em;
+      font-size: 95%;
+      height: 13ex;
+      width: 50%;
+    }
+    
-    /* for scroll test on really big screens */
-    body {
@@ -190 +198 @@
-<div><div></div> </div><span> </span>
-</div>
+
+<div id="getStyle_test">Testing getStyle</div>
-
-
@@ -1257 +1267 @@
-      assertEqual(0, $('op3').getStyle('opacity'));
-      
-navigator.appVersion.match(/MSIE/)
+Prototype.Browser.IE
-        assertEqual('alpha(opacity=30)', $('op1').getStyle('filter'));
-        assertEqual('progid:DXImageTransform.Microsoft.Blur(strength=10)alpha(opacity=30)', $('op2').getStyle('filter'));
@@ -1264 +1274 @@
-        assertEqual('alpha(opacity=0)', $('op3').getStyle('filter'));
-        assertEqual(0.3, $('op4-ie').getStyle('opacity'));
+        
+        // make sure IE returns px values for non-px units
+        assert($('getStyle_test').getStyle('margin-left').include('px'));
+        
-      }
-      // verify that value is still found when using camelized
@@ -1275 +1289 @@
-      // TODO: This test fails on IE because there seems to be no way
-      // to calculate this properly (clientWidth/Height returns 0)
-navigator.appVersion.match(/MSIE/)
+Prototype.Browser.IE
-        assertEqual("14px", $('style_test_dimensions').getStyle('width'));
-        assertEqual("17px", $('style_test_dimensions').getStyle('height'));