X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Foffset.js;h=55c3c436a68c6977fed8602907e168809c283f50;hb=c6e88b16e9f6e45d87019db45dd04d27482d25d7;hp=835df89e3351f6858c57bf1d12ed6a2bb0fd92f1;hpb=f576ceeea9eea5fec6b31172765df4da8b264ac8;p=jquery.git

diff --git a/test/unit/offset.js b/test/unit/offset.js
index 835df89..55c3c43 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -35,17 +35,130 @@ testwin("absolute", function() {
 	equals( $w('#absolute-2').offset().top, 20, "$('#absolute-2').offset().top" );
 	equals( $w('#absolute-2').offset().left, 20, "$('#absolute-2').offset().left" );
 	
+	
+	equals( $w('#absolute-1').position().top, 0, "$('#absolute-1').position().top" );
+	equals( $w('#absolute-1').position().left, 0, "$('#absolute-1').position().left" );
+	
+	equals( $w('#absolute-1-1').position().top, 1, "$('#absolute-1-1').position().top" );
+	equals( $w('#absolute-1-1').position().left, 1, "$('#absolute-1-1').position().left" );
+	
+	equals( $w('#absolute-1-1-1').position().top, 1, "$('#absolute-1-1-1').position().top" );
+	equals( $w('#absolute-1-1-1').position().left, 1, "$('#absolute-1-1-1').position().left" );
+	
+	equals( $w('#absolute-2').position().top, 19, "$('#absolute-2').position().top" );
+	equals( $w('#absolute-2').position().left, 19, "$('#absolute-2').position().left" );
+	
 	testwin["absolute"].close();
 });
 
 testwin("relative", function() {
 	var $w = testwin["relative"].$;
 	
-	equals( $w('#relative-1').offset().top, jQuery.browser.msie ? 6 : 7, "$('#relative-1').offset().top" );
+	// IE is collapsing the top margin of 1px
+	equals( $w('#relative-1').offset().top, $.browser.msie ? 6 : 7, "$('#relative-1').offset().top" );
 	equals( $w('#relative-1').offset().left, 7, "$('#relative-1').offset().left" );
 	
-	equals( $w('#relative-2').offset().top, jQuery.browser.msie ? 141 : 142, "$('#relative-2').offset().top" );
+	// IE is collapsing the top margin of 1px
+	equals( $w('#relative-1-1').offset().top, $.browser.msie ? 13 : 15, "$('#relative-1-1').offset().top" );
+	equals( $w('#relative-1-1').offset().left, 15, "$('#relative-1-1').offset().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#relative-2').offset().top, $.browser.msie ? 141 : 142, "$('#relative-2').offset().top" );
 	equals( $w('#relative-2').offset().left, 27, "$('#relative-2').offset().left" );
 	
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#relative-1').position().top, $.browser.msie ? 5 : 6, "$('#relative-1').position().top" );
+	equals( $w('#relative-1').position().left, 6, "$('#relative-1').position().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#relative-1-1').position().top, $.browser.msie ? 4 : 5, "$('#relative-1-1').position().top" );
+	equals( $w('#relative-1-1').position().left, 5, "$('#relative-1-1').position().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#relative-2').position().top, $.browser.msie ? 140 : 141, "$('#relative-2').position().top" );
+	equals( $w('#relative-2').position().left, 26, "$('#relative-2').position().left" );
+	
 	testwin["relative"].close();
+});
+
+testwin("static", function() {
+	var $w = testwin["static"].$;
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#static-1').offset().top, $.browser.msie ? 6 : 7, "$('#static-1').offset().top" );
+	equals( $w('#static-1').offset().left, 7, "$('#static-1').offset().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#static-1-1').offset().top, $.browser.msie ? 13 : 15, "$('#static-1-1').offset().top" );
+	equals( $w('#static-1-1').offset().left, 15, "$('#static-1-1').offset().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#static-1-1-1').offset().top, $.browser.msie ? 20 : 23, "$('#static-1-1-1').offset().top" );
+	equals( $w('#static-1-1-1').offset().left, 23, "$('#static-1-1-1').offset().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#static-2').offset().top, $.browser.msie ? 121 : 122, "$('#static-2').offset().top" );
+	equals( $w('#static-2').offset().left, 7, "$('#static-2').offset().left" );
+	
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#static-1').position().top, $.browser.msie ? 5 : 6, "$('#static-1').position().top" );
+	equals( $w('#static-1').position().left, 6, "$('#static-1').position().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#static-1-1').position().top, $.browser.msie ? 12 : 14, "$('#static-1-1').position().top" );
+	equals( $w('#static-1-1').position().left, 14, "$('#static-1-1').position().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#static-1-1-1').position().top, $.browser.msie ? 19 : 22, "$('#static-1-1-1').position().top" );
+	equals( $w('#static-1-1-1').position().left, 22, "$('#static-1-1-1').position().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#static-2').position().top, $.browser.msie ? 120 : 121, "$('#static-2').position().top" );
+	equals( $w('#static-2').position().left, 6, "$('#static-2').position().left" );
+	
+	testwin["static"].close();
+});
+
+if ( !$.browser.msie || ($.browser.msie && parseInt($.browser.version) > 6) )
+	testwin("fixed", function() {
+		var $w = testwin["fixed"].$;
+	
+		equals( $w('#fixed-1').offset().top, 1001, "$('#fixed-1').offset().top" );
+		equals( $w('#fixed-1').offset().left, $.browser.msie ? 994 : 1001, "$('#fixed-1').offset().left" );
+	
+		equals( $w('#fixed-2').offset().top, 1021, "$('#fixed-2').offset().top" );
+		equals( $w('#fixed-2').offset().left, $.browser.msie ? 1014 : 1021, "$('#fixed-2').offset().left" );
+	
+		testwin["fixed"].close();
+	});
+
+testwin("table", function() {
+	var $w = testwin["table"].$;
+	
+	equals( $w('#table-1').offset().top, 6, "$('#table-1').offset().top" );
+	equals( $w('#table-1').offset().left, 6, "$('#table-1').offset().left" );
+	
+	equals( $w('#th-1').offset().top, 10, "$('#table-1').offset().top" );
+	equals( $w('#th-1').offset().left, 10, "$('#table-1').offset().left" );
+	
+	equals( $w('#th-2').offset().top, 10, "$('#table-1').offset().top" );
+	equals( $w('#th-2').offset().left, 116, "$('#table-1').offset().left" );
+	
+	testwin["table"].close();
+});
+
+testwin("scroll", function() {
+	var $w = testwin["scroll"].$;
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#scroll-1').offset().top, $.browser.msie ? 6 : 7, "$('#scroll-1').offset().top" );
+	equals( $w('#scroll-1').offset().left, 7, "$('#scroll-1').offset().left" );
+	
+	// IE is collapsing the top margin of 1px
+	equals( $w('#scroll-1-1').offset().top, $.browser.msie ? 9 : 11, "$('#scroll-1-1').offset().top" );
+	equals( $w('#scroll-1-1').offset().left, 11, "$('#scroll-1-1').offset().left" );
+	
+	testwin["scroll"].close();
 });
\ No newline at end of file