X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Foffset.js;h=ed3d9622a3755d16835915df7f49be472eae699a;hb=ba9e0fc177841bd74cc5ea4e52f09cd87d747bf5;hp=ef84e5cd0faf1d1558788d1122f113f343ba7262;hpb=1844f95c5b2f92a1b388ff43e20aa4f065a6e57c;p=jquery.git

diff --git a/test/unit/offset.js b/test/unit/offset.js
index ef84e5c..ed3d962 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -1,5 +1,7 @@
 module("offset");
 
+var supportsScroll = false;
+
 testoffset("absolute"/* in iframe */, function($, iframe) {
 	expect(4);
 	
@@ -10,6 +12,12 @@ testoffset("absolute"/* in iframe */, function($, iframe) {
 	// if the offset method is using the scroll offset
 	// of the parent window
 	var forceScroll = jQuery('<div>', { width: 2000, height: 2000 }).appendTo('body');
+	window.scrollTo(200, 200);
+
+	if ( document.documentElement.scrollTop || document.body.scrollTop ) {
+		supportsScroll = true;
+	}
+
 	window.scrollTo(1, 1);
 	
 	// get offset
@@ -35,7 +43,7 @@ testoffset("absolute"/* in iframe */, function($, iframe) {
 });
 
 testoffset("absolute", function( jQuery ) {
-	expect(176);
+	expect(178);
 	
 	// get offset tests
 	var tests = [
@@ -62,6 +70,11 @@ testoffset("absolute", function( jQuery ) {
 		equals( jQuery( this.id ).position().left, this.left, "jQuery('" + this.id + "').position().left" );
 	});
 	
+	// test #5781
+	var offset = jQuery( '#positionTest' ).offset({ top: 10, left: 10 }).offset();
+	equals( offset.top,  10, "Setting offset on element with position absolute but 'auto' values." )
+	equals( offset.left, 10, "Setting offset on element with position absolute but 'auto' values." )
+	
 	
 	// set offset
 	tests = [
@@ -97,8 +110,9 @@ testoffset("absolute", function( jQuery ) {
 		equals( jQuery( this.id ).offset().top,  this.top  + 1, "jQuery('" + this.id + "').offset({ top: "  + (this.top  + 1) + " })" );
 		equals( jQuery( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + (this.left + 1) + " })" );
 		
-		jQuery( this.id ).offset({ top: this.top + 2 });
-		jQuery( this.id ).offset({ left: this.left + 2 });
+		jQuery( this.id )
+			.offset({ left: this.left + 2 })
+			.offset({ top:  this.top  + 2 });
 		equals( jQuery( this.id ).offset().top,  this.top  + 2, "Setting one property at a time." );
 		equals( jQuery( this.id ).offset().left, this.left + 2, "Setting one property at a time." );
 		
@@ -250,8 +264,13 @@ testoffset("fixed", function( jQuery ) {
 		{ id: '#fixed-1', top: 1001, left: 1001 },
 		{ id: '#fixed-2', top: 1021, left: 1021 }
 	];
+
 	jQuery.each( tests, function() {
-		if ( jQuery.offset.supportsFixedPosition ) {
+		if ( !supportsScroll ) {
+			ok( true, "Browser doesn't support scroll position." );
+			ok( true, "Browser doesn't support scroll position." );
+
+		} else if ( jQuery.offset.supportsFixedPosition ) {
 			equals( jQuery( this.id ).offset().top,  this.top,  "jQuery('" + this.id + "').offset().top" );
 			equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset().left" );
 		} else {
@@ -329,12 +348,20 @@ testoffset("scroll", function( jQuery, win ) {
 	// equals( jQuery('body').scrollLeft(), 0, "jQuery('body').scrollTop()" );
 	
 	win.name = "test";
-	
-	equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" );
-	equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" );
-	
-	equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" );
-	equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" );
+
+	if ( !supportsScroll ) {
+		ok( true, "Browser doesn't support scroll position." );
+		ok( true, "Browser doesn't support scroll position." );
+
+		ok( true, "Browser doesn't support scroll position." );
+		ok( true, "Browser doesn't support scroll position." );
+	} else {
+		equals( jQuery(win).scrollTop(), 1000, "jQuery(window).scrollTop()" );
+		equals( jQuery(win).scrollLeft(), 1000, "jQuery(window).scrollLeft()" );
+	
+		equals( jQuery(win.document).scrollTop(), 1000, "jQuery(document).scrollTop()" );
+		equals( jQuery(win.document).scrollLeft(), 1000, "jQuery(document).scrollLeft()" );
+	}
 	
 	// test jQuery using parent window/document
 	// jQuery reference here is in the iframe