Remove code for ticket #7717 which has been marked WONTFIX to match existing $.data...

[jquery.git] / test / unit / offset.js

diff --git a/test/unit/offset.js b/test/unit/offset.js
index 0f5c964..8797531 100644 (file)
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -1,5 +1,16 @@
 module("offset");
 
+test("disconnected node", function() {
+       expect(2);
+
+       var result = jQuery( document.createElement("div") ).offset();
+
+       equals( result.top, 0, "Check top" );
+       equals( result.left, 0, "Check left" );
+});
+
+var supportsScroll = false;
+
 testoffset("absolute"/* in iframe */, function($, iframe) {
        expect(4);
        
@@ -10,6 +21,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 +52,7 @@ testoffset("absolute"/* in iframe */, function($, iframe) {
 });
 
 testoffset("absolute", function( jQuery ) {
-       expect(144);
+       expect(178);
        
        // get offset tests
        var tests = [
@@ -62,6 +79,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 = [
@@ -94,8 +116,14 @@ testoffset("absolute", function( jQuery ) {
                        equals( val.left, left, "Verify incoming top position." );
                        return { top: top + 1, left: left + 1 };
                });
-               equals( jQuery( this.id ).offset().top,  this.top + 1,  "jQuery('" + this.id + "').offset({ top: "  + this.top  + " })" );
-               equals( jQuery( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );
+               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({ 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." );
                
                jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) {
                        jQuery( this ).css({
@@ -112,7 +140,7 @@ testoffset("relative", function( jQuery ) {
        expect(60);
        
        // IE is collapsing the top margin of 1px
-       var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;
+       var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
        
        // get offset
        var tests = [
@@ -173,7 +201,7 @@ testoffset("static", function( jQuery ) {
        expect(80);
        
        // IE is collapsing the top margin of 1px
-       var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;
+       var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
        
        // get offset
        var tests = [
@@ -245,8 +273,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 {
@@ -302,7 +335,7 @@ testoffset("table", function( jQuery ) {
 testoffset("scroll", function( jQuery, win ) {
        expect(16);
        
-       var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;
+       var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
        
        // IE is collapsing the top margin of 1px
        equals( jQuery('#scroll-1').offset().top, ie ? 6 : 7, "jQuery('#scroll-1').offset().top" );
@@ -324,12 +357,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
@@ -404,7 +445,7 @@ function testoffset(name, fn) {
        });
        
        function loadFixture() {
-               var src = './data/offset/' + name + '.html?' + parseInt( Math.random()*1000 ),
+               var src = './data/offset/' + name + '.html?' + parseInt( Math.random()*1000, 10 ),
                        iframe = jQuery('<iframe />').css({
                                width: 500, height: 500, position: 'absolute', top: -600, left: -600, visiblity: 'hidden'
                        }).appendTo('body')[0];